diff --git a/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo_Net10.csproj b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo_Net10.csproj
new file mode 100644
index 00000000..042eb297
--- /dev/null
+++ b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo_Net10.csproj
@@ -0,0 +1,15 @@
+
+
+
+ net10.0
+ enable
+ enable
+ true
+
+
+
+
+
+
+
+
diff --git a/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Components/App.razor b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Components/App.razor
new file mode 100644
index 00000000..81f7373a
--- /dev/null
+++ b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Components/App.razor
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Components/Layout/MainLayout.razor b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Components/Layout/MainLayout.razor
new file mode 100644
index 00000000..2382b486
--- /dev/null
+++ b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Components/Layout/MainLayout.razor
@@ -0,0 +1,8 @@
+@inherits LayoutComponentBase
+
+
+
+ @Body
+
+
+
diff --git a/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Components/Layout/MainLayout.razor.css b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Components/Layout/MainLayout.razor.css
new file mode 100644
index 00000000..38d1f259
--- /dev/null
+++ b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Components/Layout/MainLayout.razor.css
@@ -0,0 +1,98 @@
+.page {
+ position: relative;
+ display: flex;
+ flex-direction: column;
+}
+
+main {
+ flex: 1;
+}
+
+.sidebar {
+ background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
+}
+
+.top-row {
+ background-color: #f7f7f7;
+ border-bottom: 1px solid #d6d5d5;
+ justify-content: flex-end;
+ height: 3.5rem;
+ display: flex;
+ align-items: center;
+}
+
+ .top-row ::deep a, .top-row ::deep .btn-link {
+ white-space: nowrap;
+ margin-left: 1.5rem;
+ text-decoration: none;
+ }
+
+ .top-row ::deep a:hover, .top-row ::deep .btn-link:hover {
+ text-decoration: underline;
+ }
+
+ .top-row ::deep a:first-child {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
+@media (max-width: 640.98px) {
+ .top-row {
+ justify-content: space-between;
+ }
+
+ .top-row ::deep a, .top-row ::deep .btn-link {
+ margin-left: 0;
+ }
+}
+
+@media (min-width: 641px) {
+ .page {
+ flex-direction: row;
+ }
+
+ .sidebar {
+ width: 250px;
+ height: 100vh;
+ position: sticky;
+ top: 0;
+ }
+
+ .top-row {
+ position: sticky;
+ top: 0;
+ z-index: 1;
+ }
+
+ .top-row.auth ::deep a:first-child {
+ flex: 1;
+ text-align: right;
+ width: 0;
+ }
+
+ .top-row, article {
+ padding-left: 2rem !important;
+ padding-right: 1.5rem !important;
+ }
+}
+
+#blazor-error-ui {
+ color-scheme: light only;
+ background: lightyellow;
+ bottom: 0;
+ box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
+ box-sizing: border-box;
+ display: none;
+ left: 0;
+ padding: 0.6rem 1.25rem 0.7rem 1.25rem;
+ position: fixed;
+ width: 100%;
+ z-index: 1000;
+}
+
+ #blazor-error-ui .dismiss {
+ cursor: pointer;
+ position: absolute;
+ right: 0.75rem;
+ top: 0.5rem;
+ }
diff --git a/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Components/Pages/Home.razor b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Components/Pages/Home.razor
new file mode 100644
index 00000000..3981552e
--- /dev/null
+++ b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Components/Pages/Home.razor
@@ -0,0 +1,166 @@
+@page "/"
+
+@using Syncfusion.Blazor.Diagram
+@using Syncfusion.Blazor.Buttons
+@using System.Threading.Tasks
+
+
+
+
+
+
+
+
+
+
+
+ @{
+ string? content = context.AdditionalInfo["Content"]?.ToString();
+ }
+ @if (!string.IsNullOrEmpty(content))
+ {
+
@content
+ }
+
+
+
+
+
+
+
+@code {
+
+ private SfDiagramComponent diagram;
+ private DiagramObjectCollection nodes;
+ private bool isAnnotationTemplate = false;
+
+ // This event is triggered before a new entry is added to the history stack.
+ private void OnHistoryAdding(HistoryAddingEventArgs entry)
+ {
+ if (isAnnotationTemplate)
+ {
+ // The flag is true during a programmatic AdditionalInfo update.
+ // Cancel the diagram's automatic history entry to prevent duplicates.
+ entry.Cancel = true;
+ }
+ }
+
+ // Called when the user performs an Undo action.
+ private void OnCustomUndo(HistoryEntryBase entry)
+ {
+ if (entry.UndoObject != null && entry.UndoObject is Node node)
+ {
+ // To prevent property change entry
+ isAnnotationTemplate = true;
+
+ // Restore AdditionalInfo from the undo snapshot (stored on the annotation)
+ diagram.Nodes?[0].Annotations?[0].AdditionalInfo = new Dictionary(node.Annotations?[0].AdditionalInfo);
+
+ isAnnotationTemplate = false;
+ }
+ }
+
+ // Called when the user performs an Redo action.
+ private void OnCustomRedo(HistoryEntryBase entry)
+ {
+ if (entry.RedoObject != null && entry.RedoObject is Node node)
+ {
+ // To prevent property change entry
+ isAnnotationTemplate = true;
+
+ // Restore AdditionalInfo from the redo snapshot (stored on the annotation)
+ diagram.Nodes?[0].Annotations?[0].AdditionalInfo = new Dictionary(node.Annotations?[0].AdditionalInfo);
+
+ isAnnotationTemplate = false;
+ }
+ }
+
+ protected override void OnInitialized()
+ {
+ InitializeDiagram();
+ }
+
+ private void InitializeDiagram()
+ {
+ nodes = new DiagramObjectCollection();
+
+ Dictionary annotationInfo = new Dictionary
+ {
+ { "Content", "Annotation" },
+ };
+
+ Node node = new Node()
+ {
+ ID = "node",
+ Width = 150,
+ Height = 120,
+ OffsetX = 200,
+ OffsetY = 200,
+ Annotations = new DiagramObjectCollection()
+ {
+ new ShapeAnnotation
+ {
+ UseTemplate = true,
+ Width = 150,
+ Height = 120,
+ AdditionalInfo = annotationInfo
+ }
+ },
+ Style = new ShapeStyle()
+ {
+ Fill = "#6495ED",
+ StrokeColor = "white"
+ },
+ };
+ nodes.Add(node);
+ }
+
+ private async Task UpdateAnnotationAsync(string content)
+ {
+ diagram.BeginUpdate();
+
+ HistoryEntry entry = new HistoryEntry();
+
+ // Capture the current state (before changes) as the undo snapshot
+ (entry.UndoObject) = diagram.Nodes?[0].Clone() as Node;
+
+ entry.Type = HistoryEntryType.Undo;
+
+ // To prevent property change entry
+ isAnnotationTemplate = true;
+
+ // Update AdditionalInfo on the annotation so context.AdditionalInfo reflects it in the template
+ diagram.Nodes?[0].Annotations?[0].AdditionalInfo = new Dictionary
+ {
+ { "Content", content },
+ };
+
+ isAnnotationTemplate = false;
+
+ // Capture the updated state as the redo snapshot
+ (entry.RedoObject) = diagram.Nodes?[0].Clone() as Node;
+
+ diagram.AddHistoryEntry(entry);
+
+ await diagram.EndUpdateAsync();
+ }
+
+ private void UpdateAnnotation1()
+ {
+ _ = UpdateAnnotationAsync("Updated Annotation 1");
+ }
+
+ private void UpdateAnnotation2()
+ {
+ _ = UpdateAnnotationAsync("Updated Annotation 2");
+ }
+
+}
diff --git a/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Components/Routes.razor b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Components/Routes.razor
new file mode 100644
index 00000000..f756e19d
--- /dev/null
+++ b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Components/Routes.razor
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Components/_Imports.razor b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Components/_Imports.razor
new file mode 100644
index 00000000..c216fe7e
--- /dev/null
+++ b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Components/_Imports.razor
@@ -0,0 +1,13 @@
+@using System.Net.Http
+@using System.Net.Http.Json
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using static Microsoft.AspNetCore.Components.Web.RenderMode
+@using Microsoft.AspNetCore.Components.Web.Virtualization
+@using Microsoft.JSInterop
+@using AnnotationTemplateUndoRedo_Net10
+@using AnnotationTemplateUndoRedo_Net10.Components
+@using AnnotationTemplateUndoRedo_Net10.Components.Layout
+@using Syncfusion.Blazor;
+@using Syncfusion.Blazor.Diagram;
\ No newline at end of file
diff --git a/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Program.cs b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Program.cs
new file mode 100644
index 00000000..e53425fe
--- /dev/null
+++ b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Program.cs
@@ -0,0 +1,30 @@
+using AnnotationTemplateUndoRedo_Net10.Components;
+using Syncfusion.Blazor;
+
+var builder = WebApplication.CreateBuilder(args);
+
+// Add services to the container.
+builder.Services.AddRazorComponents()
+ .AddInteractiveServerComponents();
+
+builder.Services.AddSyncfusionBlazor();
+
+var app = builder.Build();
+
+// Configure the HTTP request pipeline.
+if (!app.Environment.IsDevelopment())
+{
+ app.UseExceptionHandler("/Error", createScopeForErrors: true);
+ // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+ app.UseHsts();
+}
+app.UseStatusCodePagesWithReExecute("/not-found");
+app.UseHttpsRedirection();
+
+app.UseAntiforgery();
+
+app.MapStaticAssets();
+app.MapRazorComponents()
+ .AddInteractiveServerRenderMode();
+
+app.Run();
diff --git a/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Properties/launchSettings.json b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Properties/launchSettings.json
new file mode 100644
index 00000000..1b5d5536
--- /dev/null
+++ b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/Properties/launchSettings.json
@@ -0,0 +1,23 @@
+{
+ "$schema": "https://json.schemastore.org/launchsettings.json",
+ "profiles": {
+ "http": {
+ "commandName": "Project",
+ "dotnetRunMessages": true,
+ "launchBrowser": true,
+ "applicationUrl": "http://localhost:5131",
+ "environmentVariables": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ }
+ },
+ "https": {
+ "commandName": "Project",
+ "dotnetRunMessages": true,
+ "launchBrowser": true,
+ "applicationUrl": "https://localhost:7091;http://localhost:5131",
+ "environmentVariables": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ }
+ }
+ }
+ }
diff --git a/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/appsettings.Development.json b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/appsettings.Development.json
new file mode 100644
index 00000000..0c208ae9
--- /dev/null
+++ b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/appsettings.Development.json
@@ -0,0 +1,8 @@
+{
+ "Logging": {
+ "LogLevel": {
+ "Default": "Information",
+ "Microsoft.AspNetCore": "Warning"
+ }
+ }
+}
diff --git a/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/appsettings.json b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/appsettings.json
new file mode 100644
index 00000000..10f68b8c
--- /dev/null
+++ b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/appsettings.json
@@ -0,0 +1,9 @@
+{
+ "Logging": {
+ "LogLevel": {
+ "Default": "Information",
+ "Microsoft.AspNetCore": "Warning"
+ }
+ },
+ "AllowedHosts": "*"
+}
diff --git a/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/wwwroot/app.css b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/wwwroot/app.css
new file mode 100644
index 00000000..73a69d6f
--- /dev/null
+++ b/KB-Samples/AnnotationTemplateUndoRedo/AnnotationTemplateUndoRedo/wwwroot/app.css
@@ -0,0 +1,60 @@
+html, body {
+ font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+}
+
+a, .btn-link {
+ color: #006bb7;
+}
+
+.btn-primary {
+ color: #fff;
+ background-color: #1b6ec2;
+ border-color: #1861ac;
+}
+
+.btn:focus, .btn:active:focus, .btn-link.nav-link:focus, .form-control:focus, .form-check-input:focus {
+ box-shadow: 0 0 0 0.1rem white, 0 0 0 0.25rem #258cfb;
+}
+
+.content {
+ padding-top: 1.1rem;
+}
+
+h1:focus {
+ outline: none;
+}
+
+.valid.modified:not([type=checkbox]) {
+ outline: 1px solid #26b050;
+}
+
+.invalid {
+ outline: 1px solid #e50000;
+}
+
+.validation-message {
+ color: #e50000;
+}
+
+.blazor-error-boundary {
+ background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
+ padding: 1rem 1rem 1rem 3.7rem;
+ color: white;
+}
+
+ .blazor-error-boundary::after {
+ content: "An error has occurred."
+ }
+
+.darker-border-checkbox.form-check-input {
+ border-color: #929292;
+}
+
+.form-floating > .form-control-plaintext::placeholder, .form-floating > .form-control::placeholder {
+ color: var(--bs-secondary-color);
+ text-align: end;
+}
+
+.form-floating > .form-control-plaintext:focus::placeholder, .form-floating > .form-control:focus::placeholder {
+ text-align: start;
+}
\ No newline at end of file