misc:try

2026-03-03 00:00:55 +08:00 · 2025-04-30 17:09:15 +08:00
144 changed files with 1542 additions and 1445 deletions
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -24,6 +24,9 @@ jobs:
      - name: Publish .NET Project
        run: dotnet publish $PROJECT_PATH -c Release --nologo

+      - name: Change base-tag in index.html
+        run: sed -i 's#<base href="/" />#<base href="/Semi.Avalonia/" />#g' $OUTPUT_PATH/index.html
+
      - name: copy index.html to 404.html
        run: cp $OUTPUT_PATH/index.html $OUTPUT_PATH/404.html

--- a/.github/workflows/pack-nightly.yml
+++ b/.github/workflows/pack-nightly.yml
@@ -45,29 +45,29 @@ jobs:

      - name: Pack Semi.Avalonia
        if: ${{ github.event.inputs.Semi_Avalonia == 'true' }}
-        run: dotnet pack src/Semi.Avalonia -o nugets /p:Version=${{ env.VERSION }}
+        run: dotnet pack ./src/Semi.Avalonia -o ./nugets /p:Version=${{ env.VERSION }}

      - name: Pack Semi.Avalonia.ColorPicker
        if: ${{ github.event.inputs.Semi_Avalonia_ColorPicker == 'true' }}
-        run: dotnet pack src/Semi.Avalonia.ColorPicker -o nugets /p:Version=${{ env.VERSION }}
+        run: dotnet pack ./src/Semi.Avalonia.ColorPicker -o ./nugets /p:Version=${{ env.VERSION }}

      - name: Pack Semi.Avalonia.DataGrid
        if: ${{ github.event.inputs.Semi_Avalonia_DataGrid == 'true' }}
-        run: dotnet pack src/Semi.Avalonia.DataGrid -o nugets /p:Version=${{ env.VERSION }}
+        run: dotnet pack ./src/Semi.Avalonia.DataGrid -o ./nugets /p:Version=${{ env.VERSION }}

      - name: Pack Semi.Avalonia.TreeDataGrid
        if: ${{ github.event.inputs.Semi_Avalonia_TreeDataGrid == 'true' }}
-        run: dotnet pack src/Semi.Avalonia.TreeDataGrid -o nugets /p:Version=${{ env.VERSION }}
+        run: dotnet pack ./src/Semi.Avalonia.TreeDataGrid -o ./nugets /p:Version=${{ env.VERSION }}

      - name: Add NuGet Source
        run: dotnet nuget add source ${{ secrets.IRIHI_NUGET_NIGHTLY_FEED }} -n irihi.tech -u ${{ secrets.IRIHI_NUGET_USERNAME }} -p ${{ secrets.IRIHI_NUGET_PASSWORD }} --store-password-in-clear-text

      - name: Publish Nightly Package
-        run: dotnet nuget push "nugets/*.nupkg" --api-key ${{ secrets.IRIHI_NUGET_API_KEY }} --source irihi.tech --skip-duplicate
+        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.3.1
        with:
          name: nugets
-          path: nugets
+          path: ./nugets
        if: always()
--- a/.github/workflows/pack.yml
+++ b/.github/workflows/pack.yml
@@ -34,26 +34,26 @@ jobs:

      - name: Pack Semi.Avalonia
        if: ${{ github.event.inputs.Semi_Avalonia == 'true' }}
-        run: dotnet pack src/Semi.Avalonia -o nugets
+        run: dotnet pack ./src/Semi.Avalonia -o ./nugets

      - name: Pack Semi.Avalonia.ColorPicker
        if: ${{ github.event.inputs.Semi_Avalonia_ColorPicker == 'true' }}
-        run: dotnet pack src/Semi.Avalonia.ColorPicker -o nugets
+        run: dotnet pack ./src/Semi.Avalonia.ColorPicker -o ./nugets

      - name: Pack Semi.Avalonia.DataGrid
        if: ${{ github.event.inputs.Semi_Avalonia_DataGrid == 'true' }}
-        run: dotnet pack src/Semi.Avalonia.DataGrid -o nugets
+        run: dotnet pack ./src/Semi.Avalonia.DataGrid -o ./nugets

      - name: Pack Semi.Avalonia.TreeDataGrid
        if: ${{ github.event.inputs.Semi_Avalonia_TreeDataGrid == 'true' }}
-        run: dotnet pack src/Semi.Avalonia.TreeDataGrid -o nugets
+        run: dotnet pack ./src/Semi.Avalonia.TreeDataGrid -o ./nugets

      - name: Publish NuGet package
-        run: dotnet nuget push "nugets/*.nupkg" --api-key ${{ secrets.NUGET_ORG_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
+        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.3.1
        with:
          name: nugets
-          path: nugets
+          path: ./nugets
        if: always()
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -13,23 +13,13 @@ on:
          - 'linux'
          - 'android'
          - 'all'
-      win64:
-        description: 'Windows x64'
+      include_aot:
+        description: 'Include Windows AOT packaging'
        required: true
        default: true
        type: boolean
-      win64_aot:
-        description: 'Windows x64 AOT'
-        required: true
-        default: true
-        type: boolean
-      linux64:
-        description: 'Linux x64'
-        required: true
-        default: true
-        type: boolean
-      linux64_drm:
-        description: 'Linux x64 DRM'
+      include_drm:
+        description: 'Include Linux DRM packaging'
        required: true
        default: true
        type: boolean
@@ -46,36 +36,34 @@ jobs:
        run: mkdir upload

      - name: Publish win-x64
-        if: ${{ github.event.inputs.win64 == 'true' }}
-        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o publish/win64 --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
+        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/win64

      - name: Zip win-x64
-        if: ${{ github.event.inputs.win64 == 'true' }}
        run: |
-          $files = Get-ChildItem -Path publish/win64/* -Recurse -Exclude *.pdb
-          Compress-Archive -Path $files.FullName -DestinationPath upload/Semi.Avalonia.Demo.Desktop.win-x64.zip
+          $files = Get-ChildItem -Path ./publish/win64/* -Recurse -Exclude *.pdb
+          Compress-Archive -Path $files.FullName -DestinationPath ./upload/Semi.Avalonia.Demo.Desktop.win-x64.zip

      - name: Enable Native AOT in .csproj
-        if: ${{ github.event.inputs.win64_aot == 'true' }}
+        if: ${{ github.event.inputs.include_aot == 'true' }}
        run: |
          sed -i 's#<!--<PublishAot>true</PublishAot>-->#<PublishAot>true</PublishAot>#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
          sed -i 's#<!--<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>-->#<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj

      - name: Publish win-x64 AOT
-        if: ${{ github.event.inputs.win64_aot == 'true' }}
-        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o publish/win64-aot
+        if: ${{ github.event.inputs.include_aot == 'true' }}
+        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o ./publish/win64-aot

      - name: Zip win-x64 AOT
-        if: ${{ github.event.inputs.win64_aot == 'true' }}
+        if: ${{ github.event.inputs.include_aot == 'true' }}
        run: |
-          $files = Get-ChildItem -Path publish/win64-aot/* -Recurse -Exclude *.pdb
-          Compress-Archive -Path $files.FullName -DestinationPath upload/Semi.Avalonia.Demo.Desktop.win-x64.NativeAOT.zip
+          $files = Get-ChildItem -Path ./publish/win64-aot/* -Recurse -Exclude *.pdb
+          Compress-Archive -Path $files.FullName -DestinationPath ./upload/Semi.Avalonia.Demo.Desktop.win-x64.NativeAOT.zip

      - name: Upload a Build Artifact
        uses: actions/upload-artifact@v4.3.1
        with:
          name: windows
-          path: upload
+          path: ./upload

  linux:
    if: ${{ github.event.inputs.platform == 'linux' || github.event.inputs.platform == 'all' }}
@@ -88,26 +76,24 @@ jobs:
        run: mkdir upload

      - name: Publish linux-x64
-        if: ${{ github.event.inputs.linux64 == 'true' }}
-        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r linux-x64 -c Release -o publish/linux64 --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
+        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r linux-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/linux64

      - name: Zip linux-x64
-        if: ${{ github.event.inputs.linux64 == 'true' }}
-        run: zip -j -r upload/Semi.Avalonia.Demo.Desktop.linux-x64.zip publish/linux64 -x "*.pdb"
+        run: zip -j -r ./upload/Semi.Avalonia.Demo.Desktop.linux-x64.zip ./publish/linux64 -x "*.pdb"

      - name: Publish linux-x64 DRM
-        if: ${{ github.event.inputs.linux64_drm == 'true' }}
-        run: dotnet publish demo/Semi.Avalonia.Demo.Drm -r linux-x64 -c Release -o publish/drm --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
+        if: ${{ github.event.inputs.include_drm == 'true' }}
+        run: dotnet publish demo/Semi.Avalonia.Demo.Drm -r linux-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/drm

      - name: Zip linux-x64 DRM
-        if: ${{ github.event.inputs.linux64_drm == 'true' }}
-        run: zip -j -r upload/Semi.Avalonia.Demo.Drm.linux-x64.zip publish/drm -x "*.pdb"
+        if: ${{ github.event.inputs.include_drm == 'true' }}
+        run: zip -j -r ./upload/Semi.Avalonia.Demo.Drm.linux-x64.zip ./publish/drm -x "*.pdb"

      - name: Upload a Build Artifact
        uses: actions/upload-artifact@v4.3.1
        with:
          name: linux
-          path: upload
+          path: ./upload

  android:
    if: ${{ github.event.inputs.platform == 'android' || github.event.inputs.platform == 'all' }}
@@ -117,16 +103,16 @@ jobs:
        uses: actions/checkout@v4.1.1

      - name: CD Android
-        run: cd demo/Semi.Avalonia.Demo.Android
+        run: cd ./demo/Semi.Avalonia.Demo.Android

      - name: Restore Dependencies
        run: dotnet restore

      - name: Publish Android
-        run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore -o publish -p:RuntimeIdentifier=android-arm64
+        run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore -o ./publish -p:RuntimeIdentifier=android-arm64

      - name: Upload a Build Artifact
        uses: actions/upload-artifact@v4.3.1
        with:
          name: android
-          path: publish/*Signed.apk
+          path: ./publish/*Signed.apk
--- a/.github/workflows/release-tag.yml
+++ b/.github/workflows/release-tag.yml
@@ -15,16 +15,16 @@ jobs:
        uses: actions/checkout@v4

      - name: Pack Semi.Avalonia
-        run: dotnet pack src/Semi.Avalonia -o nugets
+        run: dotnet pack ./src/Semi.Avalonia -o ./nugets

      - name: Pack Semi.Avalonia.ColorPicker
-        run: dotnet pack src/Semi.Avalonia.ColorPicker -o nugets
+        run: dotnet pack ./src/Semi.Avalonia.ColorPicker -o ./nugets

      - name: Upload a Build Artifact
        uses: actions/upload-artifact@v4
        with:
          name: nugets
-          path: nugets
+          path: ./nugets

  publish-windows:
    runs-on: windows-latest
@@ -36,12 +36,12 @@ jobs:
        run: mkdir upload

      - name: Publish win-x64
-        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o publish/win64 --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
+        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/win64

      - name: Zip win-x64
        run: |
-          $files = Get-ChildItem -Path publish/win64/* -Recurse -Exclude *.pdb
-          Compress-Archive -Path $files.FullName -DestinationPath upload/Semi.Avalonia.Demo.Desktop.win-x64.zip
+          $files = Get-ChildItem -Path ./publish/win64/* -Recurse -Exclude *.pdb
+          Compress-Archive -Path $files.FullName -DestinationPath ./upload/Semi.Avalonia.Demo.Desktop.win-x64.zip

      - name: Enable Native AOT in .csproj
        run: |
@@ -49,18 +49,18 @@ jobs:
          sed -i 's#<!--<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>-->#<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>#' 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/win64-aot
+        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o ./publish/win64-aot

      - name: Zip win-x64 AOT
        run: |
-          $files = Get-ChildItem -Path publish/win64-aot/* -Recurse -Exclude *.pdb
-          Compress-Archive -Path $files.FullName -DestinationPath upload/Semi.Avalonia.Demo.Desktop.win-x64.NativeAOT.zip
+          $files = Get-ChildItem -Path ./publish/win64-aot/* -Recurse -Exclude *.pdb
+          Compress-Archive -Path $files.FullName -DestinationPath ./upload/Semi.Avalonia.Demo.Desktop.win-x64.NativeAOT.zip

      - name: Upload a Build Artifact
        uses: actions/upload-artifact@v4
        with:
          name: windows
-          path: upload
+          path: ./upload

  publish-linux:
    runs-on: ubuntu-latest
@@ -72,22 +72,22 @@ jobs:
        run: mkdir upload

      - name: Publish linux-x64
-        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r linux-x64 -c Release -o publish/linux64 --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
+        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r linux-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/linux64

      - name: Zip linux-x64
-        run: zip -j -r upload/Semi.Avalonia.Demo.Desktop.linux-x64.zip publish/linux64 -x "*.pdb"
+        run: zip -j -r ./upload/Semi.Avalonia.Demo.Desktop.linux-x64.zip ./publish/linux64 -x "*.pdb"

      - name: Publish linux-x64 DRM
-        run: dotnet publish demo/Semi.Avalonia.Demo.Drm -r linux-x64 -c Release -o publish/drm --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
+        run: dotnet publish demo/Semi.Avalonia.Demo.Drm -r linux-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/drm

      - name: Zip linux-x64 DRM
-        run: zip -j -r upload/Semi.Avalonia.Demo.Drm.linux-x64.zip publish/drm -x "*.pdb"
+        run: zip -j -r ./upload/Semi.Avalonia.Demo.Drm.linux-x64.zip ./publish/drm -x "*.pdb"

      - name: Upload a Build Artifact
        uses: actions/upload-artifact@v4
        with:
          name: linux
-          path: upload
+          path: ./upload

  publish-android:
    runs-on: windows-latest
@@ -96,19 +96,19 @@ jobs:
        uses: actions/checkout@v4

      - name: CD Android
-        run: cd demo/Semi.Avalonia.Demo.Android
+        run: cd ./demo/Semi.Avalonia.Demo.Android

      - name: Restore Dependencies
        run: dotnet restore

      - name: Publish Android
-        run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore -o publish -p:RuntimeIdentifier=android-arm64
+        run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore -o ./publish -p:RuntimeIdentifier=android-arm64

      - name: Upload a Build Artifact
        uses: actions/upload-artifact@v4
        with:
          name: android
-          path: publish/*Signed.apk
+          path: ./publish/*Signed.apk

  draft-release:
    needs: [ pack, publish-windows, publish-linux, publish-android ]
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2022 IRIHI Technology
+Copyright (c) 2022 iriHi Technology

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/demo/Directory.Build.props
+++ b/demo/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
    <PropertyGroup>
-        <AvaloniaVersion>11.3.0</AvaloniaVersion>
-        <DataGridVersion>11.3.0</DataGridVersion>
+        <AvaloniaVersion>11.2.5</AvaloniaVersion>
+        <DataGridVersion>11.2.5</DataGridVersion>
        <CommunityToolkitVersion>8.4.0</CommunityToolkitVersion>
    </PropertyGroup>
 </Project>
--- a/demo/Semi.Avalonia.Demo/Constant/ColorTokens.cs
+++ b/demo/Semi.Avalonia.Demo/Constant/ColorTokens.cs
@@ -5,8 +5,8 @@ namespace Semi.Avalonia.Demo.Constant;

 public static class ColorTokens
 {
-    public static IReadOnlyList<Tuple<string, string>> PrimaryTokens { get; } =
-    [
+    public static IReadOnlyList<Tuple<string, string>> PrimaryTokens { get; } = new List<Tuple<string, string>>
+    {
        new("SemiColorPrimary", "Primary"),
        new("SemiColorPrimaryPointerover", "Primary Pointerover"),
        new("SemiColorPrimaryActive", "Primary Active"),
@@ -14,130 +14,130 @@ public static class ColorTokens
        new("SemiColorPrimaryLight", "Primary Light"),
        new("SemiColorPrimaryLightPointerover", "Primary Light Pointerover"),
        new("SemiColorPrimaryLightActive", "Primary Light Active"),
-    ];
+    };

-    public static IReadOnlyList<Tuple<string, string>> SecondaryTokens { get; } =
-    [
+    public static IReadOnlyList<Tuple<string, string>> SecondaryTokens { get; } = new List<Tuple<string, string>>
+    {
        new("SemiColorSecondary", "Secondary"),
        new("SemiColorSecondaryPointerover", "Secondary Pointerover"),
        new("SemiColorSecondaryActive", "Secondary Active"),
        new("SemiColorSecondaryDisabled", "Secondary Disabled"),
        new("SemiColorSecondaryLight", "Secondary Light"),
        new("SemiColorSecondaryLightPointerover", "Secondary Light Pointerover"),
-        new("SemiColorSecondaryLightActive", "Secondary Light Active")
-    ];
+        new("SemiColorSecondaryLightActive", "Secondary Light Active"),
+    };

-    public static IReadOnlyList<Tuple<string, string>> TertiaryTokens { get; } =
-    [
+    public static IReadOnlyList<Tuple<string, string>> TertiaryTokens { get; } = new List<Tuple<string, string>>
+    {
        new("SemiColorTertiary", "Tertiary"),
        new("SemiColorTertiaryPointerover", "Tertiary Pointerover"),
        new("SemiColorTertiaryActive", "Tertiary Active"),
        new("SemiColorTertiaryLight", "Tertiary Light"),
        new("SemiColorTertiaryLightPointerover", "Tertiary Light Pointerover"),
-        new("SemiColorTertiaryLightActive", "Tertiary Light Active")
-    ];
+        new("SemiColorTertiaryLightActive", "Tertiary Light Active"),
+    };

-    public static IReadOnlyList<Tuple<string, string>> InformationTokens { get; } =
-    [
+    public static IReadOnlyList<Tuple<string, string>> InformationTokens { get; } = new List<Tuple<string, string>>
+    {
        new("SemiColorInformation", "Information"),
        new("SemiColorInformationPointerover", "Information Pointerover"),
        new("SemiColorInformationActive", "Information Active"),
        new("SemiColorInformationDisabled", "Information Disabled"),
        new("SemiColorInformationLight", "Information Light"),
        new("SemiColorInformationLightPointerover", "Information Light Pointerover"),
-        new("SemiColorInformationLightActive", "Information Light Active")
-    ];
+        new("SemiColorInformationLightActive", "Information Light Active"),
+    };

-    public static IReadOnlyList<Tuple<string, string>> SuccessTokens { get; } =
-    [
+    public static IReadOnlyList<Tuple<string, string>> SuccessTokens { get; } = new List<Tuple<string, string>>
+    {
        new("SemiColorSuccess", "Success"),
        new("SemiColorSuccessPointerover", "Success Pointerover"),
        new("SemiColorSuccessActive", "Success Active"),
        new("SemiColorSuccessDisabled", "Success Disabled"),
        new("SemiColorSuccessLight", "Success Light"),
        new("SemiColorSuccessLightPointerover", "Success Light Pointerover"),
-        new("SemiColorSuccessLightActive", "Success Light Active")
-    ];
+        new("SemiColorSuccessLightActive", "Success Light Active"),
+    };

-    public static IReadOnlyList<Tuple<string, string>> WarningTokens { get; } =
-    [
+    public static IReadOnlyList<Tuple<string, string>> WarningTokens { get; } = new List<Tuple<string, string>>
+    {
        new("SemiColorWarning", "Warning"),
        new("SemiColorWarningPointerover", "Warning Pointerover"),
        new("SemiColorWarningActive", "Warning Active"),
        new("SemiColorWarningLight", "Warning Light"),
        new("SemiColorWarningLightPointerover", "Warning Light Pointerover"),
-        new("SemiColorWarningLightActive", "Warning Light Active")
-    ];
+        new("SemiColorWarningLightActive", "Warning Light Active"),
+    };

-    public static IReadOnlyList<Tuple<string, string>> DangerTokens { get; } =
-    [
+    public static IReadOnlyList<Tuple<string, string>> DangerTokens { get; } = new List<Tuple<string, string>>
+    {
        new("SemiColorDanger", "Danger"),
        new("SemiColorDangerPointerover", "Danger Pointerover"),
        new("SemiColorDangerActive", "Danger Active"),
        new("SemiColorDangerLight", "Danger Light"),
        new("SemiColorDangerLightPointerover", "Danger Light Pointerover"),
-        new("SemiColorDangerLightActive", "Danger Light Active")
-    ];
+        new("SemiColorDangerLightActive", "Danger Light Active"),
+    };

-    public static IReadOnlyList<Tuple<string, string>> TextTokens { get; } =
-    [
+    public static IReadOnlyList<Tuple<string, string>> TextTokens { get; } = new List<Tuple<string, string>>
+    {
        new("SemiColorText0", "Text 0"),
        new("SemiColorText1", "Text 1"),
        new("SemiColorText2", "Text 2"),
-        new("SemiColorText3", "Text 3")
-    ];
+        new("SemiColorText3", "Text 3"),
+    };

-    public static IReadOnlyList<Tuple<string, string>> LinkTokens { get; } =
-    [
+    public static IReadOnlyList<Tuple<string, string>> LinkTokens { get; } = new List<Tuple<string, string>>
+    {
        new("SemiColorLink", "Link"),
        new("SemiColorLinkPointerover", "Link Pointerover"),
        new("SemiColorLinkActive", "Link Active"),
-        new("SemiColorLinkVisited", "Link Visited")
-    ];
+        new("SemiColorLinkVisited", "Link Visited"),
+    };

-    public static IReadOnlyList<Tuple<string, string>> BackgroundTokens { get; } =
-    [
+    public static IReadOnlyList<Tuple<string, string>> BackgroundTokens { get; } = new List<Tuple<string, string>>
+    {
        new("SemiColorBackground0", "Background 0"),
        new("SemiColorBackground1", "Background 1"),
        new("SemiColorBackground2", "Background 2"),
        new("SemiColorBackground3", "Background 3"),
-        new("SemiColorBackground4", "Background 4")
-    ];
+        new("SemiColorBackground4", "Background 4"),
+    };

-    public static IReadOnlyList<Tuple<string, string>> FillTokens { get; } =
-    [
+    public static IReadOnlyList<Tuple<string, string>> FillTokens { get; } = new List<Tuple<string, string>>
+    {
        new("SemiColorFill0", "Fill 0"),
        new("SemiColorFill1", "Fill 1"),
-        new("SemiColorFill2", "Fill 2")
-    ];
+        new("SemiColorFill2", "Fill 2"),
+    };

-    public static IReadOnlyList<Tuple<string, string>> BorderTokens { get; } =
-    [
+    public static IReadOnlyList<Tuple<string, string>> BorderTokens { get; } = new List<Tuple<string, string>>
+    {
        new("SemiColorBorder", "Border"),
-        new("SemiColorFocusBorder", "Focus Border")
-    ];
+        new("SemiColorFocusBorder", "Focus Border"),
+    };

-    public static IReadOnlyList<Tuple<string, string>> DisabledTokens { get; } =
-    [
+    public static IReadOnlyList<Tuple<string, string>> DisabledTokens { get; } = new List<Tuple<string, string>>
+    {
        new("SemiColorDisabledText", "Disabled Text"),
        new("SemiColorDisabledBorder", "Disabled Border"),
        new("SemiColorDisabledBackground", "Disabled Background"),
-        new("SemiColorDisabledFill", "Disabled Fill")
-    ];
+        new("SemiColorDisabledFill", "Disabled Fill"),
+    };

-    public static IReadOnlyList<Tuple<string, string>> OtherTokens { get; } =
-    [
+    public static IReadOnlyList<Tuple<string, string>> OtherTokens { get; } = new List<Tuple<string, string>>
+    {
        new("SemiColorWhite", "White"),
        new("SemiColorBlack", "Black"),
        new("SemiColorNavBackground", "Navigation Background"),
        new("SemiColorOverlayBackground", "Overlay Background"),
        new("SemiColorHighlightBackground", "Highlight Background"),
-        new("SemiColorHighlight", "Highlight Text")
-    ];
+        new("SemiColorHighlight", "Highlight Text"),
+    };

-    public static IReadOnlyList<Tuple<string, string>> ShadowTokens { get; } =
-    [
+    public static IReadOnlyList<Tuple<string, string>> ShadowTokens { get; } = new List<Tuple<string, string>>
+    {
        new("SemiColorShadow", "Shadow"),
-        new("SemiShadowElevated", "Shadow Elevated")
-    ];
+        new("SemiShadowElevated", "Shadow Elevated"),
+    };
 }
--- a/demo/Semi.Avalonia.Demo/Pages/AboutUs.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/AboutUs.axaml
@@ -1,237 +0,0 @@
-<UserControl
-    x:Class="Semi.Avalonia.Demo.Pages.AboutUs"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:collections="clr-namespace:Avalonia.Collections;assembly=Avalonia.Base"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:iri="https://irihi.tech/shared"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:vm="clr-namespace:Semi.Avalonia.Demo.ViewModels"
-    x:DataType="vm:AboutUsViewModel"
-    x:CompileBindings="True"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Light">
-                    <collections:AvaloniaList x:Key="CanvasPalette" x:TypeArguments="Color">
-                        <Color>#FFFDB7A5</Color>
-                        <Color>#FFF6A0B5</Color>
-                        <Color>#FFDD9BE0</Color>
-                        <Color>#FFC4A7E9</Color>
-                        <Color>#FFA7B3E1</Color>
-                        <Color>#FF98CDFD</Color>
-                        <Color>#FF95D8F8</Color>
-                    </collections:AvaloniaList>
-                    <LinearGradientBrush x:Key="TileTitleForeground" StartPoint="">
-                        <GradientStop Offset="0.0" Color="#FFA20B48" />
-                        <GradientStop Offset="0.3" Color="#FF71168A" />
-                        <GradientStop Offset="0.6" Color="#FF46259E" />
-                        <GradientStop Offset="1.0" Color="#FF28348C" />
-                    </LinearGradientBrush>
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="Dark">
-                    <collections:AvaloniaList x:Key="CanvasPalette" x:TypeArguments="Color">
-                        <Color>#FFB42019</Color>
-                        <Color>#FFA41751</Color>
-                        <Color>#FF731F8A</Color>
-                        <Color>#FF582EA0</Color>
-                        <Color>#FF29368E</Color>
-                        <Color>#FF135CB8</Color>
-                        <Color>#FF0366A9</Color>
-                    </collections:AvaloniaList>
-                    <LinearGradientBrush x:Key="TileTitleForeground">
-                        <GradientStop Offset="0.0" Color="#FFF7A8BC" />
-                        <GradientStop Offset="0.3" Color="#FFDDA0E1" />
-                        <GradientStop Offset="0.6" Color="#FFBEADE9" />
-                        <GradientStop Offset="1.0" Color="#FFA7B4E2" />
-                    </LinearGradientBrush>
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-            <ControlTheme x:Key="TileButton" TargetType="Button">
-                <Setter Property="HorizontalContentAlignment" Value="Left" />
-                <Setter Property="Padding" Value="24" />
-                <Setter Property="VerticalContentAlignment" Value="Center" />
-                <Setter Property="Template">
-                    <ControlTemplate>
-                        <Border
-                            Padding="0"
-                            Classes="Hover"
-                            Cursor="Hand"
-                            Theme="{DynamicResource CardBorder}">
-                            <Border.Transitions>
-                                <Transitions>
-                                    <BrushTransition Property="BorderBrush" Duration="0.5" />
-                                </Transitions>
-                            </Border.Transitions>
-                            <ContentPresenter
-                                Padding="{TemplateBinding Padding}"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Content="{TemplateBinding Content}"
-                                ContentTemplate="{TemplateBinding ContentTemplate}" />
-                        </Border>
-                    </ControlTemplate>
-                </Setter>
-                <Style Selector="^:pointerover /template/ Border">
-                    <Setter Property="BorderBrush" Value="{DynamicResource TileTitleForeground}" />
-                </Style>
-            </ControlTheme>
-        </ResourceDictionary>
-    </UserControl.Resources>
-    <UserControl.Styles>
-        <Style Selector="TextBlock.TileTitle">
-            <Setter Property="FontWeight" Value="700" />
-            <Setter Property="FontSize" Value="24" />
-            <Setter Property="Margin" Value="0 0 0 8" />
-            <Setter Property="Foreground" Value="{DynamicResource TileTitleForeground}" />
-        </Style>
-    </UserControl.Styles>
-    <Grid RowDefinitions="*, Auto">
-        <ScrollViewer>
-            <StackPanel>
-                <Grid
-                    Margin="0,96,0,48"
-                    HorizontalAlignment="Center"
-                    ColumnDefinitions="*, *"
-                    RowDefinitions="*, *">
-                    <iri:IrihiLogo
-                        Grid.Row="0"
-                        Grid.RowSpan="2"
-                        Grid.Column="0"
-                        Fill="{DynamicResource TextBlockSecondaryForeground}"
-                        Width="96"
-                        Margin="0,0,24,0"
-                        VerticalAlignment="Center" />
-                    <TextBlock
-                        Grid.Row="0"
-                        Grid.Column="1"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Bottom"
-                        Classes="Secondary"
-                        FontSize="48"
-                        FontWeight="700"
-                        Text="铱泓科技" />
-                    <TextBlock
-                        Grid.Row="1"
-                        Grid.Column="1"
-                        Margin="12,0,0,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Classes="Secondary"
-                        FontSize="16"
-                        Text="IRIHI Technology" />
-                </Grid>
-                <TextBlock
-                    HorizontalAlignment="Center"
-                    Classes="Tertiary"
-                    FontSize="20"
-                    FontWeight="700"
-                    Text="聚焦生产力的美学进化" />
-                <TextBlock
-                    HorizontalAlignment="Center"
-                    Classes="Tertiary"
-                    FontSize="20"
-                    Text="Aesthetic Evolution of Productivity" />
-                <UniformGrid
-                    MaxWidth="810"
-                    Margin="24"
-                    HorizontalAlignment="Center"
-                    Columns="2">
-                    <Button
-                        Margin="8"
-                        Command="{Binding NavigateCommand}"
-                        CommandParameter="semi"
-                        Theme="{DynamicResource TileButton}">
-                        <StackPanel HorizontalAlignment="Left">
-                            <TextBlock Classes="TileTitle" Text="Semi" />
-                            <StackPanel Orientation="Horizontal" Margin="0 0 0 8">
-                                <Label Theme="{DynamicResource TagLabel}" Classes="Blue Ghost">Open Source</Label>
-                            </StackPanel>
-                            <TextBlock Text="开箱即用的独立主题库" />
-                            <TextBlock Text="A ready-to-use standalone theme library" />
-                        </StackPanel>
-                    </Button>
-                    <Button
-                        Margin="8"
-                        Command="{Binding NavigateCommand}"
-                        CommandParameter="ursa"
-                        Theme="{DynamicResource TileButton}">
-                        <StackPanel HorizontalAlignment="Left">
-                            <TextBlock Classes="TileTitle" Text="Ursa" />
-                            <StackPanel Orientation="Horizontal" Margin="0 0 0 8">
-                                <Label Theme="{DynamicResource TagLabel}" Classes="Blue Ghost">Open Source</Label>
-                            </StackPanel>
-                            <TextBlock Text="高性能企业级桌面客户端控件库" />
-                            <TextBlock Text="High-performance enterprise level control library for desktop apps" />
-                        </StackPanel>
-                    </Button>
-                    <Button
-                        Margin="8"
-                        Command="{Binding NavigateCommand}"
-                        CommandParameter="mantra"
-                        Theme="{DynamicResource TileButton}">
-                        <StackPanel HorizontalAlignment="Left">
-                            <TextBlock Classes="TileTitle" Text="Mantra" />
-                            <StackPanel Orientation="Horizontal" Margin="0 0 0 8">
-                                <Label Theme="{DynamicResource TagLabel}" Classes="Purple Ghost">Commercial</Label>
-                            </StackPanel>
-                            <TextBlock Text="高性能文字排版渲染控件库" />
-                            <TextBlock Text="High-performance typography control library" />
-                        </StackPanel>
-                    </Button>
-                    <Button
-                        Margin="8"
-                        Command="{Binding NavigateCommand}"
-                        CommandParameter="huska"
-                        Theme="{DynamicResource TileButton}">
-                        <StackPanel HorizontalAlignment="Left">
-                            <TextBlock Classes="TileTitle" Text="Huska" />
-                            <StackPanel Orientation="Horizontal" Margin="0 0 0 8">
-                                <Label Theme="{DynamicResource TagLabel}" Classes="Purple Ghost">Commercial</Label>
-                            </StackPanel>
-                            <TextBlock Text="手绘风格主题库" />
-                            <TextBlock Text="Hand-drawing theme library" />
-                        </StackPanel>
-                    </Button>
-                </UniformGrid>
-            </StackPanel>
-        </ScrollViewer>
-        <StackPanel
-            Grid.Row="1"
-            Margin="0,16"
-            Spacing="32"
-            HorizontalAlignment="Center"
-            Orientation="Horizontal">
-            <StackPanel Orientation="Horizontal">
-                <HyperlinkButton
-                    Classes="WithIcon"
-                    VerticalAlignment="Center"
-                    Content="Homepage"
-                    NavigateUri="https://irihi.tech">
-                    <HyperlinkButton.Styles>
-                        <Style Selector=".WithIcon /template/ PathIcon">
-                            <Setter Property="Data" Value="{StaticResource SemiIconHome}" />
-                        </Style>
-                    </HyperlinkButton.Styles>
-                </HyperlinkButton>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal">
-                <HyperlinkButton
-                    Classes="WithIcon"
-                    Content="GitHub"
-                    NavigateUri="https://github.com/irihitech">
-                    <HyperlinkButton.Styles>
-                        <Style Selector=".WithIcon /template/ PathIcon">
-                            <Setter Property="Data" Value="{StaticResource SemiIconGithubLogo}" />
-                        </Style>
-                    </HyperlinkButton.Styles>
-                </HyperlinkButton>
-            </StackPanel>
-        </StackPanel>
-    </Grid>
-</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/AboutUs.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/AboutUs.axaml.cs
@@ -1,24 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Semi.Avalonia.Demo.ViewModels;
-
-namespace Semi.Avalonia.Demo.Pages;
-
-public partial class AboutUs : UserControl
-{
-    public AboutUs()
-    {
-        InitializeComponent();
-        this.DataContext = new AboutUsViewModel();
-    }
-
-    protected override void OnLoaded(RoutedEventArgs e)
-    {
-        base.OnLoaded(e);
-        if (this.DataContext is AboutUsViewModel vm)
-        {
-            var launcher = TopLevel.GetTopLevel(this)?.Launcher;
-            vm.Launcher = launcher;
-        }
-    }
-}
--- a/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml
@@ -3,15 +3,15 @@
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:Semi.Avalonia.Demo.Pages"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:vm="clr-namespace:Semi.Avalonia.Demo.ViewModels"
    d:DesignHeight="450"
    d:DesignWidth="800"
    x:CompileBindings="False"
-    x:DataType="vm:AutoCompleteBoxDemoViewModel"
+    x:DataType="local:AutoCompleteBoxDemoViewModel"
    mc:Ignorable="d">
    <Design.DataContext>
-        <vm:AutoCompleteBoxDemoViewModel />
+        <local:AutoCompleteBoxDemoViewModel />
    </Design.DataContext>
    <StackPanel HorizontalAlignment="Left" Spacing="20">
        <StackPanel.Styles>
@@ -21,7 +21,7 @@
                    <Binding Path="States" />
                </Setter>
                <Setter Property="ItemTemplate">
-                    <DataTemplate DataType="vm:StateData">
+                    <DataTemplate DataType="local:StateData">
                        <TextBlock Text="{Binding Name}" />
                    </DataTemplate>
                </Setter>
--- a/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml.cs
@@ -1,5 +1,9 @@
+using System.Collections.ObjectModel;
+using Avalonia;
 using Avalonia.Controls;
-using Semi.Avalonia.Demo.ViewModels;
+using Avalonia.Markup.Xaml;
+using System.Collections.Generic;
+using CommunityToolkit.Mvvm.ComponentModel;

 namespace Semi.Avalonia.Demo.Pages;

@@ -10,4 +14,86 @@ public partial class AutoCompleteBoxDemo : UserControl
        InitializeComponent();
        this.DataContext = new AutoCompleteBoxDemoViewModel();
    }
+}
+
+public class AutoCompleteBoxDemoViewModel: ObservableObject
+{
+    public ObservableCollection<StateData> States { get; set; }
+
+    public AutoCompleteBoxDemoViewModel()
+    {
+        States = new ObservableCollection<StateData>(GetStates());
+        
+    }
+
+    private static List<StateData> GetStates()
+    {
+        return new List<StateData>
+        {
+            new StateData("Alabama", "AL", "Montgomery"),
+            new StateData("Alaska", "AK", "Juneau"),
+            new StateData("Arizona", "AZ", "Phoenix"),
+            new StateData("Arkansas", "AR", "Little Rock"),
+            new StateData("California", "CA", "Sacramento"),
+            new StateData("Colorado", "CO", "Denver"),
+            new StateData("Connecticut", "CT", "Hartford"),
+            new StateData("Delaware", "DE", "Dover"),
+            new StateData("Florida", "FL", "Tallahassee"),
+            new StateData("Georgia", "GA", "Atlanta"),
+            new StateData("Hawaii", "HI", "Honolulu"),
+            new StateData("Idaho", "ID", "Boise"),
+            new StateData("Illinois", "IL", "Springfield"),
+            new StateData("Indiana", "IN", "Indianapolis"),
+            new StateData("Iowa", "IA", "Des Moines"),
+            new StateData("Kansas", "KS", "Topeka"),
+            new StateData("Kentucky", "KY", "Frankfort"),
+            new StateData("Louisiana", "LA", "Baton Rouge"),
+            new StateData("Maine", "ME", "Augusta"),
+            new StateData("Maryland", "MD", "Annapolis"),
+            new StateData("Massachusetts", "MA", "Boston"),
+            new StateData("Michigan", "MI", "Lansing"),
+            new StateData("Minnesota", "MN", "St. Paul"),
+            new StateData("Mississippi", "MS", "Jackson"),
+            new StateData("Missouri", "MO", "Jefferson City"),
+            new StateData("Montana", "MT", "Helena"),
+            new StateData("Nebraska", "NE", "Lincoln"),
+            new StateData("Nevada", "NV", "Carson City"),
+            new StateData("New Hampshire", "NH", "Concord"),
+            new StateData("New Jersey", "NJ", "Trenton"),
+            new StateData("New Mexico", "NM", "Santa Fe"),
+            new StateData("New York", "NY", "Albany"),
+            new StateData("North Carolina", "NC", "Raleigh"),
+            new StateData("North Dakota", "ND", "Bismarck"),
+            new StateData("Ohio", "OH", "Columbus"),
+            new StateData("Oklahoma", "OK", "Oklahoma City"),
+            new StateData("Oregon", "OR", "Salem"),
+            new StateData("Pennsylvania", "PA", "Harrisburg"),
+            new StateData("Rhode Island", "RI", "Providence"),
+            new StateData("South Carolina", "SC", "Columbia"),
+            new StateData("South Dakota", "SD", "Pierre"),
+            new StateData("Tennessee", "TN", "Nashville"),
+            new StateData("Texas", "TX", "Austin"),
+            new StateData("Utah", "UT", "Salt Lake City"),
+            new StateData("Vermont", "VT", "Montpelier"),
+            new StateData("Virginia", "VA", "Richmond"),
+            new StateData("Washington", "WA", "Olympia"),
+            new StateData("West Virginia", "WV", "Charleston"),
+            new StateData("Wisconsin", "WI", "Madison"),
+            new StateData("Wyoming", "WY", "Cheyenne"),
+        };
+    }
+}
+
+public class StateData
+{
+    public string Name { get; private set; }
+    public string Abbreviation { get; private set; }
+    public string Capital { get; private set; }
+
+    public StateData(string name, string abbreviation, string capital)
+    {
+        Name = name;
+        Abbreviation = abbreviation;
+        Capital = capital;
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/BorderDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/BorderDemo.axaml
@@ -18,4 +18,4 @@
            <TextBlock>Shadow on Pointerover</TextBlock>
        </Border>
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/BorderDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/BorderDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
@@ -112,14 +112,14 @@
                    IsEnabled="False" />
            </StackPanel>
            <StackPanel Orientation="Horizontal" Spacing="8">
-                <DropDownButton Content="Default" Classes="Success" />
-                <DropDownButton Content="Solid" Theme="{DynamicResource SolidDropDownButton}" Classes="Success" />
-                <DropDownButton Content="Outline" Theme="{DynamicResource OutlineDropDownButton}" Classes="Success" />
-                <DropDownButton Content="Borderless" Theme="{DynamicResource BorderlessDropDownButton}" Classes="Success" />
-                <DropDownButton Content="Default" Classes="Success" IsEnabled="False" />
-                <DropDownButton Content="Solid" Theme="{DynamicResource SolidDropDownButton}" Classes="Success" IsEnabled="False" />
-                <DropDownButton Content="Outline" Theme="{DynamicResource OutlineDropDownButton}" Classes="Success" IsEnabled="False" />
-                <DropDownButton Content="Borderless" Theme="{DynamicResource BorderlessDropDownButton}" Classes="Success" IsEnabled="False" />
+                <DropDownButton Content="Default" Classes="Success"/>
+                <DropDownButton Content="Solid" Theme="{DynamicResource SolidDropDownButton}" Classes="Success"/>
+                <DropDownButton Content="Outline" Theme="{DynamicResource OutlineDropDownButton}" Classes="Success"/>
+                <DropDownButton Content="Borderless" Theme="{DynamicResource BorderlessDropDownButton}" Classes="Success"/>
+                <DropDownButton Content="Default" Classes="Success" IsEnabled="False"/>
+                <DropDownButton Content="Solid" Theme="{DynamicResource SolidDropDownButton}" Classes="Success" IsEnabled="False"/>
+                <DropDownButton Content="Outline" Theme="{DynamicResource OutlineDropDownButton}" Classes="Success" IsEnabled="False"/>
+                <DropDownButton Content="Borderless" Theme="{DynamicResource BorderlessDropDownButton}" Classes="Success" IsEnabled="False"/>
            </StackPanel>
            <StackPanel Orientation="Horizontal" Spacing="8">
                <DropDownButton Classes="Small" Content="Small" />
@@ -139,7 +139,7 @@
            </StackPanel>
            <StackPanel Orientation="Horizontal" Spacing="8">
                <SplitButton Content="Default" Classes="Success" />
-                <SplitButton Content="Solid" Theme="{DynamicResource SolidSplitButton}" Classes="Success" />
+                <SplitButton Content="Solid" Theme="{DynamicResource SolidSplitButton}"  Classes="Success" />
                <SplitButton Content="Outline" Theme="{DynamicResource OutlineSplitButton}" Classes="Success" />
                <SplitButton Content="Borderless" Theme="{DynamicResource BorderlessSplitButton}" Classes="Success" />
                <SplitButton Content="Default" Classes="Success" IsEnabled="False" />
@@ -165,7 +165,7 @@
            </StackPanel>
            <StackPanel Orientation="Horizontal" Spacing="8">
                <ToggleSplitButton Content="Default" Classes="Success" />
-                <ToggleSplitButton Content="Checked" Classes="Success" IsChecked="True" />
+                <ToggleSplitButton Content="Checked" Classes="Success" IsChecked="True"  />
                <ToggleSplitButton Content="Default" Classes="Success" IsEnabled="False" />
                <ToggleSplitButton Content="Checked" Classes="Success" IsChecked="True" IsEnabled="False" />
            </StackPanel>
--- a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml
@@ -32,4 +32,4 @@
                Text="A.S.I.A" />
        </ButtonSpinner>
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml.cs
@@ -1,5 +1,7 @@
 using System;
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

@@ -29,6 +31,7 @@ public partial class ButtonSpinnerDemo : UserControl

            txtBox.Text = _mountains[value];
        }
+
    }

    private readonly string[] _mountains = new[]
--- a/demo/Semi.Avalonia.Demo/Pages/CalendarDatePickerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/CalendarDatePickerDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/CalendarDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/CalendarDemo.axaml
@@ -11,4 +11,4 @@
        <Calendar />
        <Calendar SelectionMode="SingleRange" />
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/CalendarDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/CalendarDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

@@ -8,4 +10,9 @@ public partial class CalendarDemo : UserControl
    {
        InitializeComponent();
    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/CarouselDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/CarouselDemo.axaml.cs
@@ -1,4 +1,7 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/ColorPickerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ColorPickerDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml
@@ -4,12 +4,12 @@
    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:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
    d:DesignHeight="800"
    d:DesignWidth="800"
    mc:Ignorable="d">
    <Design.DataContext>
-        <vm:ComboBoxDemoViewModel />
+        <pages:ComboBoxDemoViewModel />
    </Design.DataContext>
    <StackPanel Spacing="20">
        <StackPanel.Styles>
@@ -28,13 +28,13 @@
        <ComboBox Classes="Bordered" />
        <ComboBox Classes="Bordered" IsEnabled="False" />
        <ComboBox>
-            <ComboBox.SelectionBoxItemTemplate>
-                <DataTemplate DataType="x:String">
-                    <ContentControl BorderThickness="1"
-                                    BorderBrush="Gold"
-                                    Content="{Binding}" />
-                </DataTemplate>
-            </ComboBox.SelectionBoxItemTemplate>
+          <ComboBox.SelectionBoxItemTemplate>
+            <DataTemplate DataType="x:String">
+              <ContentControl BorderThickness="1"
+                              BorderBrush="Gold"
+                              Content="{Binding}" />
+            </DataTemplate>
+          </ComboBox.SelectionBoxItemTemplate>
        </ComboBox>

        <StackPanel Orientation="Horizontal">
@@ -49,4 +49,4 @@
            <ComboBox Width="100" Classes="Bordered" IsEnabled="False" />
        </StackPanel>
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml.cs
@@ -1,5 +1,6 @@
+using System.Collections.ObjectModel;
 using Avalonia.Controls;
-using Semi.Avalonia.Demo.ViewModels;
+using CommunityToolkit.Mvvm.ComponentModel;

 namespace Semi.Avalonia.Demo.Pages;

@@ -10,4 +11,9 @@ public partial class ComboBoxDemo : UserControl
        InitializeComponent();
        this.DataContext = new ComboBoxDemoViewModel();
    }
+}
+
+public class ComboBoxDemoViewModel : ObservableObject
+{
+    public ObservableCollection<string> Items { get; set; } = ["Ding", "Otter", "Husky", "Mr.17", "Cass"];
 }
--- a/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
@@ -12,54 +12,54 @@
    mc:Ignorable="d">
    <TabControl>
        <TabItem Header="DataGrid">
-            <Grid RowDefinitions="Auto, *">
-                <StackPanel Grid.Row="0" Orientation="Horizontal">
-                    <ToggleSwitch Content="Enable" Name="enable" IsChecked="True" />
-                    <ToggleSwitch Content="Inset Content" Name="inset" />
-                    <ToggleSwitch Content="ScrollBar Auto Hide" Name="autohide" />
-                </StackPanel>
-                <DataGrid Grid.Row="1"
-                          Margin="8"
-                          CanUserReorderColumns="True"
-                          CanUserResizeColumns="True"
-                          CanUserSortColumns="True"
-                          HeadersVisibility="All"
-                          IsReadOnly="True"
-                          Classes.InsetContent="{Binding #inset.IsChecked}"
-                          ScrollViewer.AllowAutoHide="{Binding #autohide.IsChecked}"
-                          IsEnabled="{Binding #enable.IsChecked}"
-                          ItemsSource="{Binding GridData1}">
-                    <DataGrid.Columns>
-                        <DataGridTextColumn
-                            Width="6*"
-                            x:DataType="vm:Song"
-                            Binding="{Binding Title}"
-                            Header="Title" />
-                        <DataGridTextColumn
-                            Width="6*"
-                            x:DataType="vm:Song"
-                            Binding="{Binding Artist}"
-                            Header="Artist" />
-                        <DataGridTextColumn
-                            Width="6*"
-                            x:DataType="vm:Song"
-                            Binding="{Binding Album}"
-                            Header="Album" />
-                        <DataGridTemplateColumn Header="Duration" SortMemberPath="Duration">
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock
-                                        Margin="8,0,0,0"
-                                        VerticalAlignment="Center"
-                                        Text="{Binding Duration}" />
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                    </DataGrid.Columns>
+           <Grid RowDefinitions="Auto, *">
+               <StackPanel Grid.Row="0" Orientation="Horizontal">
+                   <ToggleSwitch Content="Enable" Name="enable" IsChecked="True" />
+                   <ToggleSwitch Content="Inset Content" Name="inset" />
+                   <ToggleSwitch Content="ScrollBar Auto Hide" Name="autohide" />
+               </StackPanel>
+               <DataGrid Grid.Row="1"
+                         Margin="8"
+                         CanUserReorderColumns="True"
+                         CanUserResizeColumns="True"
+                         CanUserSortColumns="True"
+                         HeadersVisibility="All"
+                         IsReadOnly="True"
+                         Classes.InsetContent="{Binding #inset.IsChecked}"
+                         ScrollViewer.AllowAutoHide="{Binding #autohide.IsChecked}"
+                         IsEnabled="{Binding #enable.IsChecked}"
+                         ItemsSource="{Binding GridData1}">
+                   <DataGrid.Columns>
+                       <DataGridTextColumn
+                           Width="6*"
+                           x:DataType="vm:Song"
+                           Binding="{Binding Title}"
+                           Header="Title" />
+                       <DataGridTextColumn
+                           Width="6*"
+                           x:DataType="vm:Song"
+                           Binding="{Binding Artist}"
+                           Header="Artist" />
+                       <DataGridTextColumn
+                           Width="6*"
+                           x:DataType="vm:Song"
+                           Binding="{Binding Album}"
+                           Header="Album" />
+                       <DataGridTemplateColumn Header="Duration" SortMemberPath="Duration">
+                           <DataGridTemplateColumn.CellTemplate>
+                               <DataTemplate>
+                                   <TextBlock
+                                       Margin="8,0,0,0"
+                                       VerticalAlignment="Center"
+                                       Text="{Binding Duration}" />
+                               </DataTemplate>
+                           </DataGridTemplateColumn.CellTemplate>
+                       </DataGridTemplateColumn>
+                   </DataGrid.Columns>

-                </DataGrid>
-
-            </Grid>
+               </DataGrid>
+               
+           </Grid>
        </TabItem>
        <TabItem Header="Grouping">
            <DataGrid
@@ -177,4 +177,4 @@
            </Grid>
        </TabItem>
    </TabControl>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml.cs
@@ -1,4 +1,18 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using Avalonia;
+using Avalonia.Collections;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Markup.Xaml;
+using Avalonia.Threading;
 using Semi.Avalonia.Demo.ViewModels;

 namespace Semi.Avalonia.Demo.Pages;
--- a/demo/Semi.Avalonia.Demo/Pages/DataValidationErrorsDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/DataValidationErrorsDemo.axaml
@@ -80,4 +80,4 @@
            </TextBox>
        </StackPanel>
    </ScrollViewer>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/DataValidationErrorsDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/DataValidationErrorsDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

@@ -8,4 +10,9 @@ public partial class DataValidationErrorsDemo : UserControl
    {
        InitializeComponent();
    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/DatePickerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/DatePickerDemo.axaml
@@ -26,4 +26,4 @@
        </StackPanel>

    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/DatePickerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/DatePickerDemo.axaml.cs
@@ -1,4 +1,7 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;

 namespace Semi.Avalonia.Demo.Pages;

@@ -8,4 +11,14 @@ public partial class DatePickerDemo : UserControl
    {
        InitializeComponent();
    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+
+    public override void Render(DrawingContext context)
+    {
+        base.Render(context);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/ExpanderDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ExpanderDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml.cs
@@ -1,4 +1,7 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.LogicalTree;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml
@@ -39,4 +39,4 @@
                CornerRadius="10" />
        </Grid>
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/GridSplitterDemo.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

@@ -8,4 +9,9 @@ public partial class GridSplitterDemo : UserControl
    {
        InitializeComponent();
    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml.cs
@@ -1,4 +1,7 @@
+using System;
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml
@@ -31,7 +31,7 @@
                            VerticalAlignment="Top"
                            ColumnDefinitions="Auto, *"
                            RowDefinitions="*,*,*,*,*,*,*,*,*,*,*">
-                            <TextBlock Grid.Row="0" Grid.Column="0">Classes</TextBlock>
+                            <TextBlock Grid.Row="0"  Grid.Column="0">Classes</TextBlock>
                            <TextBlock Grid.Row="1" Grid.Column="0">-</TextBlock>
                            <TextBlock Grid.Row="2" Grid.Column="0">Secondary</TextBlock>
                            <TextBlock Grid.Row="3" Grid.Column="0">Tertiary</TextBlock>
@@ -221,4 +221,4 @@
            </WrapPanel>
        </StackPanel>
    </ScrollViewer>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml
@@ -16,7 +16,7 @@
                Header="Default">
                <ScrollViewer>
                    <StackPanel Spacing="20">
-                        <TextBlock Text="Theme: Default" />
+                        <TextBlock Text="Theme: Default"/>
                        <ListBox ItemsSource="{Binding $parent[local:ListBoxDemo].Items}" />
                        <ListBox IsEnabled="False">
                            <ListBoxItem IsSelected="True">Avalonia</ListBoxItem>
@@ -31,7 +31,7 @@
                Theme="{DynamicResource GroupBox}"
                Header="RadioGroupListBox">
                <StackPanel Spacing="20">
-                    <TextBlock Text="Theme: RadioGroupListBox" />
+                    <TextBlock Text="Theme: RadioGroupListBox"/>
                    <ListBox
                        Theme="{DynamicResource RadioGroupListBox}"
                        ItemsSource="{Binding $parent[local:ListBoxDemo].Items}" />
@@ -40,7 +40,7 @@
                        <ListBoxItem IsSelected="True">WPF</ListBoxItem>
                    </ListBox>

-                    <TextBlock Text="Theme: ButtonRadioGroupListBox" />
+                    <TextBlock Text="Theme: ButtonRadioGroupListBox"/>
                    <StackPanel Orientation="Horizontal">
                        <Border HorizontalAlignment="Left" Theme="{StaticResource RadioButtonGroupBorder}">
                            <ListBox Theme="{DynamicResource ButtonRadioGroupListBox}">
@@ -93,7 +93,7 @@
                        </Border>
                    </StackPanel>

-                    <TextBlock Text="Theme: CardRadioGroupListBox" />
+                    <TextBlock Text="Theme: CardRadioGroupListBox"/>
                    <ListBox Theme="{DynamicResource CardRadioGroupListBox}"
                             ItemsSource="{Binding $parent[local:ListBoxDemo].Items}" />
                    <ListBox Theme="{DynamicResource CardRadioGroupListBox}" IsEnabled="False">
@@ -101,7 +101,7 @@
                        <ListBoxItem>WPF</ListBoxItem>
                    </ListBox>

-                    <TextBlock Text="Theme: PureCardRadioGroupListBox" />
+                    <TextBlock Text="Theme: PureCardRadioGroupListBox"/>
                    <ListBox Theme="{DynamicResource PureCardRadioGroupListBox}"
                             ItemsSource="{Binding $parent[local:ListBoxDemo].Items}" />
                    <ListBox Theme="{DynamicResource PureCardRadioGroupListBox}" IsEnabled="False">
@@ -117,7 +117,7 @@
                Header="CheckGroupListBox">
                <ScrollViewer>
                    <StackPanel Spacing="20">
-                        <TextBlock Text="Theme: CheckGroupListBox" />
+                        <TextBlock Text="Theme: CheckGroupListBox"/>
                        <ListBox
                            SelectionMode="Multiple,Toggle"
                            Theme="{DynamicResource CheckGroupListBox}"
@@ -129,7 +129,7 @@
                            <ListBoxItem>WPF</ListBoxItem>
                        </ListBox>

-                        <TextBlock Text="Theme: CardCheckGroupListBox" />
+                        <TextBlock Text="Theme: CardCheckGroupListBox"/>
                        <ListBox
                            SelectionMode="Multiple,Toggle"
                            Theme="{DynamicResource CardCheckGroupListBox}"
--- a/demo/Semi.Avalonia.Demo/Pages/ManagedFileChooserDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ManagedFileChooserDemo.axaml
@@ -17,4 +17,4 @@
        <Button Name="SelectFolderButton" Content="Select Folder" />
        <Button Name="SaveFileButton" Content="Save File" />
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/MenuDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/MenuDemo.axaml
@@ -145,4 +145,4 @@
            <TextBlock Text="Right Click to show Context Flyout" />
        </Border>
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/MenuDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/MenuDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

@@ -9,4 +11,8 @@ public partial class MenuDemo : UserControl
        InitializeComponent();
    }

+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

@@ -9,4 +11,8 @@ public partial class NumericUpDownDemo : UserControl
        InitializeComponent();
    }

+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml.cs
@@ -9,7 +9,7 @@ public partial class Overview : UserControl
        InitializeComponent();
    }

-    public string MainInstall { get; set; } = "dotnet add package Semi.Avalonia --version 11.2.1.8";
+    public string MainInstall { get; set; } = "dotnet add package Semi.Avalonia --version 11.2.1.7";

    public string MainStyle { get; set; } =
        """
@@ -18,7 +18,7 @@ public partial class Overview : UserControl
        </Application.Styles>
        """;

-    public string ColorPickerInstall { get; set; } = "dotnet add package Semi.Avalonia.ColorPicker --version 11.2.1.8";
+    public string ColorPickerInstall { get; set; } = "dotnet add package Semi.Avalonia.ColorPicker --version 11.2.1.7";

    public string ColorPickerStyle { get; set; } =
        """
@@ -27,7 +27,7 @@ public partial class Overview : UserControl
        </Application.Styles>
        """;

-    public string DataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.DataGrid --version 11.2.1.8";
+    public string DataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.DataGrid --version 11.2.1.7";

    public string DataGridStyle { get; set; } =
        """
@@ -36,7 +36,7 @@ public partial class Overview : UserControl
        </Application.Styles>
        """;

-    public string TreeDataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.10.4";
+    public string TreeDataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.10.3";

    public string TreeDataGridStyle { get; set; } =
        """
--- a/demo/Semi.Avalonia.Demo/Pages/PathIconDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/PathIconDemo.axaml.cs
@@ -1,4 +1,6 @@
-using Avalonia.Controls;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml
@@ -20,16 +20,15 @@
                    Minimum="{Binding #slider.Minimum}"
                    Theme="{DynamicResource ProgressRing}"
                    Value="{Binding #slider.Value}"
-                    ShowProgressText="True" />
+                    ShowProgressText="True"/>
                <ProgressBar
                    Width="100"
                    Height="100"
                    IsIndeterminate="True"
-                    BorderThickness="16"
                    Maximum="{Binding #slider.Maximum}"
                    Minimum="{Binding #slider.Minimum}"
                    Theme="{DynamicResource ProgressRing}"
-                    ShowProgressText="True" />
+                    ShowProgressText="True"/>
            </StackPanel>
            <Slider
                Name="slider"
--- a/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

@@ -8,4 +10,9 @@ public partial class ProgressBarDemo : UserControl
    {
        InitializeComponent();
    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/RefreshContainerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/RefreshContainerDemo.axaml
@@ -4,10 +4,10 @@
    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:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
    d:DesignHeight="450"
    d:DesignWidth="800"
-    x:DataType="vm:RefreshContainerDemoViewModel"
+    x:DataType="pages:RefreshContainerDemoViewModel"
    x:CompileBindings="True"
    mc:Ignorable="d">
    <DockPanel HorizontalAlignment="Stretch" VerticalAlignment="Top">
@@ -24,4 +24,4 @@
                     ItemsSource="{Binding Items}" />
        </RefreshContainer>
    </DockPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/RefreshContainerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/RefreshContainerDemo.axaml.cs
@@ -1,5 +1,8 @@
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
 using Avalonia.Controls;
-using Semi.Avalonia.Demo.ViewModels;
+using CommunityToolkit.Mvvm.ComponentModel;

 namespace Semi.Avalonia.Demo.Pages;

@@ -10,14 +13,34 @@ public partial class RefreshContainerDemo : UserControl
    public RefreshContainerDemo()
    {
        InitializeComponent();
+
        _viewModel = new RefreshContainerDemoViewModel();
+
        DataContext = _viewModel;
    }

    private async void RefreshContainerPage_RefreshRequested(object? sender, RefreshRequestedEventArgs e)
    {
        var deferral = e.GetDeferral();
+
        await _viewModel.AddToTop();
+
        deferral.Complete();
    }
+}
+
+public class RefreshContainerDemoViewModel : ObservableObject
+{
+    public ObservableCollection<string> Items { get; }
+
+    public RefreshContainerDemoViewModel()
+    {
+        Items = new ObservableCollection<string>(Enumerable.Range(1, 200).Select(i => $"Item {i}"));
+    }
+
+    public async Task AddToTop()
+    {
+        await Task.Delay(1000);
+        Items.Insert(0, $"Item {200 - Items.Count}");
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/ScrollViewerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ScrollViewerDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

@@ -8,4 +10,9 @@ public partial class ScrollViewerDemo : UserControl
    {
        InitializeComponent();
    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/SelectableTextBlock.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/SelectableTextBlock.axaml
@@ -165,4 +165,4 @@
            </HeaderedContentControl>
        </StackPanel>
    </ScrollViewer>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/SelectableTextBlock.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/SelectableTextBlock.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

@@ -9,4 +11,8 @@ public partial class SelectableTextBlockDemo : UserControl
        InitializeComponent();
    }

+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/SliderDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/SliderDemo.axaml
@@ -98,4 +98,4 @@
                Value="30" />
        </StackPanel>
    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/SliderDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/SliderDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

@@ -9,4 +11,8 @@ public partial class SliderDemo : UserControl
        InitializeComponent();
    }

+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml
@@ -4,12 +4,12 @@
    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:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
    d:DesignHeight="1000"
    d:DesignWidth="800"
    mc:Ignorable="d">
    <Design.DataContext>
-        <vm:SplitViewDemoViewModel />
+        <pages:SplitViewDemoViewModel />
    </Design.DataContext>
    <Border>
        <Grid ColumnDefinitions="*,400">
@@ -49,7 +49,7 @@
                        Grid.Row="3" Grid.Column="1"
                        Name="DisplayModeSelector"
                        HorizontalAlignment="Stretch"
-                        ItemsSource="{x:Static vm:SplitViewDemoViewModel.DisplayModes}"
+                        ItemsSource="{x:Static pages:SplitViewDemoViewModel.DisplayModes}"
                        SelectedItem="{x:Static SplitViewDisplayMode.CompactInline}" />

                    <Label
@@ -114,7 +114,8 @@
                                        Theme="{DynamicResource IconBorderlessToggleSwitch}"
                                        Content="{StaticResource SemiIconSidebar}"
                                        HorizontalAlignment="Left"
-                                        IsChecked="{Binding #SplitView.IsPaneOpen}" />
+                                        IsChecked="{Binding #SplitView.IsPaneOpen}">
+                                    </ToggleSwitch>
                                </Grid>
                            </SplitView.Pane>

@@ -204,7 +205,8 @@
                                        Theme="{DynamicResource IconBorderlessToggleSwitch}"
                                        Content="{StaticResource SemiIconSidebar}"
                                        HorizontalAlignment="Left"
-                                        IsChecked="{Binding #SplitView2.IsPaneOpen}" />
+                                        IsChecked="{Binding #SplitView2.IsPaneOpen}">
+                                    </ToggleSwitch>
                                    <TextBlock
                                        Grid.Row="1"
                                        Margin="8,12"
--- a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml.cs
@@ -1,5 +1,7 @@
+using System.Collections.ObjectModel;
 using Avalonia.Controls;
-using Semi.Avalonia.Demo.ViewModels;
+using Avalonia.Markup.Xaml;
+using CommunityToolkit.Mvvm.ComponentModel;

 namespace Semi.Avalonia.Demo.Pages;

@@ -10,4 +12,33 @@ public partial class SplitViewDemo : UserControl
        InitializeComponent();
        this.DataContext = new SplitViewDemoViewModel();
    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+}
+
+public class SplitViewDemoViewModel : ObservableObject
+{
+    public ObservableCollection<string> Songs { get; set; } =
+    [
+        "320万年前",
+        "隐德来希",
+        "孔明",
+        "锦鲤卟噜噜",
+        "指鹿为马",
+        "热带季风Remix",
+        "加州梦境",
+        "渐近自由",
+        "世界所有的烂漫",
+    ];
+
+    public static ObservableCollection<SplitViewDisplayMode> DisplayModes { get; set; } =
+    [
+        SplitViewDisplayMode.Inline,
+        SplitViewDisplayMode.CompactInline,
+        SplitViewDisplayMode.Overlay,
+        SplitViewDisplayMode.CompactOverlay,
+    ];
 }
--- a/demo/Semi.Avalonia.Demo/Pages/TabControlDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/TabControlDemo.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/TextBlockDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/TextBlockDemo.axaml
@@ -159,4 +159,4 @@
            </HeaderedContentControl>
        </StackPanel>
    </ScrollViewer>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/TextBlockDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/TextBlockDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml
@@ -15,6 +15,7 @@
            <TextBox Width="300" Classes="revealPasswordButton" Text="123456" />
            <TextBox
                Width="300"
+                IsReadOnly="True"
                Classes="ClearButton RevealPasswordButton"
                InnerLeftContent="https://"
                InnerRightContent=".com"
--- a/demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

--- a/demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml
@@ -17,9 +17,9 @@
        <TimePicker Classes="Large" />
        <TimePicker Classes="Small" />
        <StackPanel Orientation="Horizontal">
-            <TimePicker Classes="Large" ClockIdentifier="12HourClock" />
-            <TimePicker ClockIdentifier="12HourClock" />
-            <TimePicker Classes="Small" ClockIdentifier="12HourClock" />
+            <TimePicker Classes="Large" ClockIdentifier="12HourClock"/>
+            <TimePicker ClockIdentifier="12HourClock"/>
+            <TimePicker Classes="Small" ClockIdentifier="12HourClock"/>
        </StackPanel>
        <StackPanel Orientation="Horizontal">
            <TimePicker IsEnabled="False" />
@@ -28,4 +28,4 @@
        </StackPanel>

    </StackPanel>
-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

@@ -8,4 +10,9 @@ public partial class TimePickerDemo : UserControl
    {
        InitializeComponent();
    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/ToggleButtonDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ToggleButtonDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

@@ -8,4 +10,9 @@ public partial class ToggleButtonDemo : UserControl
    {
        InitializeComponent();
    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/ToggleSwitchDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ToggleSwitchDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

@@ -8,4 +10,9 @@ public partial class ToggleSwitchDemo : UserControl
    {
        InitializeComponent();
    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/ToolTipDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ToolTipDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;

 namespace Semi.Avalonia.Demo.Pages;

@@ -8,4 +10,9 @@ public partial class ToolTipDemo : UserControl
    {
        InitializeComponent();
    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml
@@ -79,4 +79,4 @@

    </Grid>

-</UserControl>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml.cs
@@ -1,5 +1,7 @@
 using System.Collections.ObjectModel;
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
 using CommunityToolkit.Mvvm.ComponentModel;

 namespace Semi.Avalonia.Demo.Pages;
@@ -23,16 +25,14 @@ public class TreeViewVm : ObservableObject
    {
        Items = new ObservableCollection<TreeViewItemVm>()
        {
-            new TreeViewItemVm() { Name = "Item 1", Id = "1" },
-            new TreeViewItemVm() { Name = "Item 2", Id = "2" },
-            new TreeViewItemVm()
+            new TreeViewItemVm() {Name = "Item 1", Id = "1"},
+            new TreeViewItemVm() {Name = "Item 2", Id = "2"},
+            new TreeViewItemVm() {Name = "Item 3", Id = "3", Items = new ObservableCollection<TreeViewItemVm>()
            {
-                Name = "Item 3", Id = "3", Items = new ObservableCollection<TreeViewItemVm>()
-                {
-                    new TreeViewItemVm() { Name = "Item 3.1", Id = "3.1" },
-                    new TreeViewItemVm() { Name = "Item 3.2", Id = "3.2" },
-                    new TreeViewItemVm() { Name = "Item 3.3", Id = "3.3" },
-                },
+                new TreeViewItemVm() {Name = "Item 3.1", Id = "3.1"},
+                new TreeViewItemVm() {Name = "Item 3.2", Id = "3.2"},
+                new TreeViewItemVm() {Name = "Item 3.3", Id = "3.3"},
+            },
            },
        };

@@ -50,10 +50,8 @@ public class TreeViewVm : ObservableObject
                    ThirdItem thirdItem = new ThirdItem { Id = k, Name = $"ThirdItem {k}" };
                    secondItem.ThirdItemItems.Add(thirdItem);
                }
-
                firstItem.SecondItems.Add(secondItem);
            }
-
            MultipleLevelItems.Add(firstItem);
        }
    }
@@ -71,17 +69,18 @@ public class ItemBase
    public int Id { get; set; }
    public string? Name { get; set; }
 }
-
 public class FirstItem : ItemBase
 {
    public ObservableCollection<SecondItem>? SecondItems { get; set; }
 }
-
 public class SecondItem : ItemBase
 {
    public ObservableCollection<ThirdItem>? ThirdItemItems { get; set; }
-}

+}
 public class ThirdItem : ItemBase
 {
-}
+}
+
+
+
--- a/demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj
+++ b/demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj
@@ -19,7 +19,6 @@
            <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
        </PackageReference>
        <PackageReference Include="CommunityToolkit.Mvvm" Version="$(CommunityToolkitVersion)"/>
-        <PackageReference Include="Irihi.Avalonia.Shared" Version="0.3.0" />
    </ItemGroup>

    <ItemGroup>
--- a/demo/Semi.Avalonia.Demo/ViewModels/AboutUsViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/AboutUsViewModel.cs
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Avalonia.Platform.Storage;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-
-namespace Semi.Avalonia.Demo.ViewModels;
-
-public partial class AboutUsViewModel : ObservableObject
-{
-    public ICommand NavigateCommand { get; set; }
-
-    internal ILauncher? Launcher { get; set; }
-
-    public AboutUsViewModel()
-    {
-        NavigateCommand = new AsyncRelayCommand<string>(OnNavigateAsync);
-    }
-
-    private static readonly IReadOnlyDictionary<string, string> _keyToUrlMapping = new Dictionary<string, string>()
-    {
-        ["semi"] = "https://github.com/irihitech/Semi.Avalonia",
-        ["ursa"] = "https://github.com/irihitech/Ursa.Avalonia",
-        ["mantra"] = "https://www.bilibili.com/video/BV15pfKYbEEQ",
-        ["huska"] = "https://www.bilibili.com/video/BV1knj1zWE4A",
-    };
-
-    private async Task OnNavigateAsync(string? arg)
-    {
-        if (Launcher is not null && arg is not null && _keyToUrlMapping.TryGetValue(arg.ToLower(), out var uri))
-        {
-            await Launcher.LaunchUriAsync(new Uri(uri));
-        }
-    }
-}
--- a/demo/Semi.Avalonia.Demo/ViewModels/ApplicationViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/ApplicationViewModel.cs
@@ -2,10 +2,11 @@ using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Semi.Avalonia.Demo.Views;

 namespace Semi.Avalonia.Demo.ViewModels;

-public partial class ApplicationViewModel : ObservableObject
+public partial class ApplicationViewModel: ObservableObject
 {
    [RelayCommand]
    private void Exit()
--- a/demo/Semi.Avalonia.Demo/ViewModels/AutoCompleteBoxDemoViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/AutoCompleteBoxDemoViewModel.cs
@@ -1,68 +0,0 @@
-using System.Collections.ObjectModel;
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace Semi.Avalonia.Demo.ViewModels;
-
-public class AutoCompleteBoxDemoViewModel : ObservableObject
-{
-    public ObservableCollection<StateData> States { get; set; } =
-    [
-        new("Alabama", "AL", "Montgomery"),
-        new("Alaska", "AK", "Juneau"),
-        new("Arizona", "AZ", "Phoenix"),
-        new("Arkansas", "AR", "Little Rock"),
-        new("California", "CA", "Sacramento"),
-        new("Colorado", "CO", "Denver"),
-        new("Connecticut", "CT", "Hartford"),
-        new("Delaware", "DE", "Dover"),
-        new("Florida", "FL", "Tallahassee"),
-        new("Georgia", "GA", "Atlanta"),
-        new("Hawaii", "HI", "Honolulu"),
-        new("Idaho", "ID", "Boise"),
-        new("Illinois", "IL", "Springfield"),
-        new("Indiana", "IN", "Indianapolis"),
-        new("Iowa", "IA", "Des Moines"),
-        new("Kansas", "KS", "Topeka"),
-        new("Kentucky", "KY", "Frankfort"),
-        new("Louisiana", "LA", "Baton Rouge"),
-        new("Maine", "ME", "Augusta"),
-        new("Maryland", "MD", "Annapolis"),
-        new("Massachusetts", "MA", "Boston"),
-        new("Michigan", "MI", "Lansing"),
-        new("Minnesota", "MN", "St. Paul"),
-        new("Mississippi", "MS", "Jackson"),
-        new("Missouri", "MO", "Jefferson City"),
-        new("Montana", "MT", "Helena"),
-        new("Nebraska", "NE", "Lincoln"),
-        new("Nevada", "NV", "Carson City"),
-        new("New Hampshire", "NH", "Concord"),
-        new("New Jersey", "NJ", "Trenton"),
-        new("New Mexico", "NM", "Santa Fe"),
-        new("New York", "NY", "Albany"),
-        new("North Carolina", "NC", "Raleigh"),
-        new("North Dakota", "ND", "Bismarck"),
-        new("Ohio", "OH", "Columbus"),
-        new("Oklahoma", "OK", "Oklahoma City"),
-        new("Oregon", "OR", "Salem"),
-        new("Pennsylvania", "PA", "Harrisburg"),
-        new("Rhode Island", "RI", "Providence"),
-        new("South Carolina", "SC", "Columbia"),
-        new("South Dakota", "SD", "Pierre"),
-        new("Tennessee", "TN", "Nashville"),
-        new("Texas", "TX", "Austin"),
-        new("Utah", "UT", "Salt Lake City"),
-        new("Vermont", "VT", "Montpelier"),
-        new("Virginia", "VA", "Richmond"),
-        new("Washington", "WA", "Olympia"),
-        new("West Virginia", "WV", "Charleston"),
-        new("Wisconsin", "WI", "Madison"),
-        new("Wyoming", "WY", "Cheyenne")
-    ];
-}
-
-public class StateData(string name, string abbreviation, string capital)
-{
-    public string Name { get; private set; } = name;
-    public string Abbreviation { get; private set; } = abbreviation;
-    public string Capital { get; private set; } = capital;
-}
--- a/demo/Semi.Avalonia.Demo/ViewModels/ComboBoxDemoViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/ComboBoxDemoViewModel.cs
@@ -1,9 +0,0 @@
-using System.Collections.ObjectModel;
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace Semi.Avalonia.Demo.ViewModels;
-
-public class ComboBoxDemoViewModel : ObservableObject
-{
-    public ObservableCollection<string> Items { get; set; } = ["Ding", "Otter", "Husky", "Mr.17", "Cass"];
-}
--- a/demo/Semi.Avalonia.Demo/ViewModels/RefreshContainerDemoViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/RefreshContainerDemoViewModel.cs
@@ -1,22 +0,0 @@
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace Semi.Avalonia.Demo.ViewModels;
-
-public class RefreshContainerDemoViewModel : ObservableObject
-{
-    public ObservableCollection<string> Items { get; }
-
-    public RefreshContainerDemoViewModel()
-    {
-        Items = new ObservableCollection<string>(Enumerable.Range(1, 200).Select(i => $"Item {i}"));
-    }
-
-    public async Task AddToTop()
-    {
-        await Task.Delay(1000);
-        Items.Insert(0, $"Item {200 - Items.Count}");
-    }
-}
--- a/demo/Semi.Avalonia.Demo/ViewModels/SplitViewDemoViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/SplitViewDemoViewModel.cs
@@ -1,29 +0,0 @@
-using System.Collections.ObjectModel;
-using Avalonia.Controls;
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace Semi.Avalonia.Demo.ViewModels;
-
-public class SplitViewDemoViewModel : ObservableObject
-{
-    public ObservableCollection<string> Songs { get; set; } =
-    [
-        "320万年前",
-        "隐德来希",
-        "孔明",
-        "锦鲤卟噜噜",
-        "指鹿为马",
-        "热带季风Remix",
-        "加州梦境",
-        "渐近自由",
-        "世界所有的烂漫",
-    ];
-
-    public static ObservableCollection<SplitViewDisplayMode> DisplayModes { get; set; } =
-    [
-        SplitViewDisplayMode.Inline,
-        SplitViewDisplayMode.CompactInline,
-        SplitViewDisplayMode.Overlay,
-        SplitViewDisplayMode.CompactOverlay,
-    ];
-}
--- a/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/FilesPageViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/FilesPageViewModel.cs
@@ -30,7 +30,7 @@ public partial class FilesPageViewModel : ObservableObject
            Source.Items = [Root];
        }
    }
-
+    
    partial void OnSelectedPathChanged(string? value)
    {
        SetSelectedPath(value);
--- a/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/SongsPageViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/SongsPageViewModel.cs
@@ -27,25 +27,25 @@ public class SongsPageViewModel : ObservableObject
            {
                new CheckBoxColumn<SongViewModel>(
                    "IsSelected",
-                    a => a.IsSelected,
+                    a => a.IsSelected, 
                    (model, b) => { model.IsSelected = b; },
                    new GridLength(108, GridUnitType.Pixel)),
                new TextColumn<SongViewModel, string>(
-                    "Title",
-                    a => a.Title,
+                    "Title", 
+                    a => a.Title, 
                    (o, a) => o.Title = a,
                    new GridLength(6, GridUnitType.Star)),
-                new TextColumn<SongViewModel, string>("Artist",
-                    a => a.Artist,
+                new TextColumn<SongViewModel, string>("Artist", 
+                    a => a.Artist, 
                    (o, a) => o.Artist = a,
                    new GridLength(6, GridUnitType.Star)),
-                new TemplateColumn<SongViewModel>("Album",
-                    "AlbumCell",
+                new TemplateColumn<SongViewModel>("Album", 
+                    "AlbumCell", 
                    "AlbumEditCell",
                    new GridLength(6, GridUnitType.Star)),
                new TemplateColumn<SongViewModel>(
-                    "Comments",
-                    "CommentsCell",
+                    "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
@@ -2,7 +2,7 @@ using CommunityToolkit.Mvvm.ComponentModel;

 namespace Semi.Avalonia.Demo.ViewModels;

-public class TreeDataGridDemoViewModel : ObservableObject
+public class TreeDataGridDemoViewModel: ObservableObject
 {
    public SongsPageViewModel SongsContext { get; } = new();
    public FilesPageViewModel FilesContext { get; } = new();
--- a/demo/Semi.Avalonia.Demo/Views/MainView.axaml
+++ b/demo/Semi.Avalonia.Demo/Views/MainView.axaml
@@ -111,9 +111,6 @@
            <TabItem Header="Overview">
                <pages:Overview />
            </TabItem>
-            <TabItem Header="About Us">
-                <pages:AboutUs />
-            </TabItem>
            <TabItem
                Theme="{DynamicResource CategoryTabItem}"
                Header="Resource Browser" />
--- a/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs
@@ -120,12 +120,6 @@ public partial class MainViewModel : ObservableObject
                        Command = SelectLocaleCommand,
                        CommandParameter = new CultureInfo("es-es")
                    },
-                    new MenuItemViewModel
-                    {
-                        Header = "Polski",
-                        Command = SelectLocaleCommand,
-                        CommandParameter = new CultureInfo("pl-pl")
-                    },
                ]
            }
        ];
--- a/demo/Semi.Avalonia.Demo/Views/MainWindow.axaml
+++ b/demo/Semi.Avalonia.Demo/Views/MainWindow.axaml
@@ -11,4 +11,4 @@
    Icon="/Assets/irihi.ico"
    mc:Ignorable="d">
    <views:MainView />
-</Window>
+</Window>
--- a/demo/Semi.Avalonia.Demo/Views/MainWindow.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Views/MainWindow.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Controls.Notifications;

 namespace Semi.Avalonia.Demo.Views;

--- a/src/Package.props
+++ b/src/Package.props
@@ -3,7 +3,7 @@
        <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
        <Nullable>enable</Nullable>
        <LangVersion>latest</LangVersion>
-        <Version>11.2.1.8</Version>
+        <Version>11.2.1.7</Version>
        <Authors>IRIHI Technology Co., Ltd.</Authors>
        <Description>Avalonia Theme inspired by Semi Design.</Description>
        <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
@@ -14,7 +14,6 @@
    </PropertyGroup>

    <ItemGroup>
-        <None Include="..\..\irihi.png" Pack="true" PackagePath="\" Link="Properties\irihi.png"/>
-        <None Include="..\..\LICENSE" Pack="true" PackagePath="\" Link="Properties\LICENSE"/>
+        <None Include="irihi.png" Pack="true" PackagePath=""/>
    </ItemGroup>
 </Project>
--- a/src/Semi.Avalonia.ColorPicker/Properties/AssemblyInfo.cs
+++ b/src/Semi.Avalonia.ColorPicker/Properties/AssemblyInfo.cs
--- a/src/Semi.Avalonia.ColorPicker/Controls/_index.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/_index.axaml
@@ -3,10 +3,10 @@
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="ColorPicker.axaml" />
-        <ResourceInclude Source="ColorPreviewer.axaml" />
-        <ResourceInclude Source="ColorSlider.axaml" />
-        <ResourceInclude Source="ColorSpectrum.axaml" />
-        <ResourceInclude Source="ColorView.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorSlider.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorSpectrum.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/ColorView.axaml" />
    </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
--- a/src/Semi.Avalonia.ColorPicker/Index.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Index.axaml
@@ -2,12 +2,12 @@
    <Styles.Resources>
        <ResourceDictionary>
            <ResourceDictionary.ThemeDictionaries>
-                <ResourceInclude x:Key="Default" Source="Light.axaml" />
-                <ResourceInclude x:Key="Dark" Source="Dark.axaml" />
+                <ResourceInclude x:Key="Default" Source="avares://Semi.Avalonia.ColorPicker/Light.axaml" />
+                <ResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia.ColorPicker/Dark.axaml" />
            </ResourceDictionary.ThemeDictionaries>
            <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="Controls/_index.axaml" />
-                <ResourceInclude Source="Shared.axaml" />
+                <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Controls/_index.axaml" />
+                <ResourceInclude Source="avares://Semi.Avalonia.ColorPicker/Shared.axaml" />
            </ResourceDictionary.MergedDictionaries>
        </ResourceDictionary>
    </Styles.Resources>
--- a/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj
+++ b/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj
@@ -4,7 +4,7 @@

    <PropertyGroup>
        <Title>Semi.Avalonia.ColorPicker</Title>
-        <PackageReleaseNotes>Update to Semi.Avalonia.ColorPicker 11.2.1.8</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to Semi.Avalonia.ColorPicker 11.2.1.7</PackageReleaseNotes>
    </PropertyGroup>

    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
--- a/src/Semi.Avalonia.DataGrid/Properties/AssemblyInfo.cs
+++ b/src/Semi.Avalonia.DataGrid/Properties/AssemblyInfo.cs
--- a/src/Semi.Avalonia.DataGrid/Index.axaml
+++ b/src/Semi.Avalonia.DataGrid/Index.axaml
@@ -2,12 +2,12 @@
    <Styles.Resources>
        <ResourceDictionary>
            <ResourceDictionary.ThemeDictionaries>
-                <ResourceInclude x:Key="Default" Source="Light.axaml" />
-                <ResourceInclude x:Key="Dark" Source="Dark.axaml" />
+                <ResourceInclude x:Key="Default" Source="avares://Semi.Avalonia.DataGrid/Light.axaml" />
+                <ResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia.DataGrid/Dark.axaml" />
            </ResourceDictionary.ThemeDictionaries>
            <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="DataGrid.axaml" />
-                <ResourceInclude Source="Shared.axaml" />
+                <ResourceInclude Source="avares://Semi.Avalonia.DataGrid/DataGrid.axaml" />
+                <ResourceInclude Source="avares://Semi.Avalonia.DataGrid/Shared.axaml" />
            </ResourceDictionary.MergedDictionaries>
        </ResourceDictionary>
    </Styles.Resources>
--- a/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj
+++ b/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj
@@ -4,8 +4,8 @@
        <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
        <Nullable>enable</Nullable>
        <LangVersion>latest</LangVersion>
-        <Version>11.2.1.8</Version>
-        <PackageReleaseNotes>Update to Semi.Avalonia.DataGrid 11.2.1.8</PackageReleaseNotes>
+        <Version>11.2.1.7</Version>
+        <PackageReleaseNotes>Update to Semi.Avalonia.DataGrid 11.2.1.7</PackageReleaseNotes>
        <Authors>IRIHI Technology Co., Ltd.</Authors>
        <Description>Avalonia Theme inspired by Semi Design.</Description>
        <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
@@ -21,8 +21,7 @@

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

 </Project>
--- a/src/Semi.Avalonia.DataGrid/irihi.png
+++ b/src/Semi.Avalonia.DataGrid/irihi.png
--- a/src/Semi.Avalonia.TreeDataGrid/Properties/AssemblyInfo.cs
+++ b/src/Semi.Avalonia.TreeDataGrid/Properties/AssemblyInfo.cs
--- a/src/Semi.Avalonia.TreeDataGrid/Index.axaml
+++ b/src/Semi.Avalonia.TreeDataGrid/Index.axaml
@@ -2,12 +2,12 @@
    <Styles.Resources>
        <ResourceDictionary>
            <ResourceDictionary.ThemeDictionaries>
-                <ResourceInclude x:Key="Default" Source="Light.axaml" />
-                <ResourceInclude x:Key="Dark" Source="Dark.axaml" />
+                <ResourceInclude x:Key="Default" Source="avares://Semi.Avalonia.TreeDataGrid/Light.axaml" />
+                <ResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia.TreeDataGrid/Dark.axaml" />
            </ResourceDictionary.ThemeDictionaries>
            <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="TreeDataGrid.axaml" />
-                <ResourceInclude Source="Shared.axaml" />
+                <ResourceInclude Source="avares://Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml" />
+                <ResourceInclude Source="avares://Semi.Avalonia.TreeDataGrid/Shared.axaml" />
            </ResourceDictionary.MergedDictionaries>
        </ResourceDictionary>
    </Styles.Resources>
--- a/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj
+++ b/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj
@@ -4,8 +4,8 @@
        <TargetFramework>net6.0</TargetFramework>
        <Nullable>enable</Nullable>
        <LangVersion>latest</LangVersion>
-        <Version>11.0.10.4</Version>
-        <PackageReleaseNotes>Update to 11.0.10.4</PackageReleaseNotes>
+        <Version>11.0.10.3</Version>
+        <PackageReleaseNotes>Update to 11.0.10.3</PackageReleaseNotes>
        <Authors>IRIHI Technology Co., Ltd.</Authors>
        <Description>Avalonia Theme inspired by Semi Design.</Description>
        <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
@@ -20,8 +20,7 @@

    <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="irihi.png" Pack="true" PackagePath=""/>
    </ItemGroup>

 </Project>
--- a/src/Semi.Avalonia.TreeDataGrid/irihi.png
+++ b/src/Semi.Avalonia.TreeDataGrid/irihi.png
--- a/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml
+++ b/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml
@@ -1,8 +1,7 @@
-<Styles
-    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">
+<Styles xmlns="https://github.com/avaloniaui"
+        x:Class="Semi.Avalonia.SemiPopupAnimations"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:converters="clr-namespace:Semi.Avalonia.Converters">
    <Style Selector="Popup LayoutTransformControl#PART_LayoutTransform">
        <Setter Property="RenderTransformOrigin" Value="{Binding $parent[Popup].Placement, Converter={x:Static converters:PlacementToRenderTransformOriginConverter.Instance}}" />
    </Style>
--- a/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml.cs
+++ b/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml.cs
@@ -2,4 +2,7 @@ using Avalonia.Styling;

 namespace Semi.Avalonia;

-public class SemiPopupAnimations : Styles;
+public class SemiPopupAnimations: Styles
+{
+    
+}
--- a/Show More
+++ b/Show More