From d17d5869790a204c7adf35576643db1d589053de Mon Sep 17 00:00:00 2001
From: Codex CLI <codex@example.com>
Date: Wed, 27 Aug 2025 04:00:17 -0500
Subject: [PATCH] another fix attempt

---
 src/AdvancedCalculator/Views/MainView.axaml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/AdvancedCalculator/Views/MainView.axaml b/src/AdvancedCalculator/Views/MainView.axaml
index f82f6a1..2d8e208 100644
--- a/src/AdvancedCalculator/Views/MainView.axaml
+++ b/src/AdvancedCalculator/Views/MainView.axaml
@@ -38,10 +38,13 @@
             <ListBox.ItemTemplate>
               <DataTemplate x:DataType="m:VariableItem">
                 <Button Background="Transparent" BorderThickness="0" Padding="8" MinHeight="44"
+                        x:DataType="vm:MainViewModel"
+                        DataContext="{Binding $parent[UserControl].DataContext}"
                         AutomationProperties.Name="Insert variable"
-                        Command="{Binding DataContext.InsertVariableCommand, ElementName=Root}"
-                        CommandParameter="{Binding VariableName}">
+                        Command="{Binding InsertVariableCommand}"
+                        CommandParameter="{Binding DataContext.VariableName, RelativeSource={RelativeSource AncestorType=ListBoxItem}}">
                   <Grid ColumnDefinitions="Auto,*,Auto"
+                        DataContext="{Binding $parent[ListBoxItem].DataContext}"
                         x:DataType="m:VariableItem">
                     <TextBlock Grid.Column="0" FontFamily="{StaticResource MDI}"
                                FontSize="{DynamicResource IconSizeM}" Text="{Binding Icon}" VerticalAlignment="Center" Margin="0,0,8,0" />
@@ -69,10 +72,13 @@
             <ListBox.ItemTemplate>
               <DataTemplate x:DataType="m:FunctionDefinitionItem">
                 <Button Background="Transparent" BorderThickness="0" Padding="8" MinHeight="44"
+                        x:DataType="vm:MainViewModel"
+                        DataContext="{Binding $parent[UserControl].DataContext}"
                         AutomationProperties.Name="Insert function"
-                        Command="{Binding DataContext.InsertFunctionCommand, ElementName=Root}"
-                        CommandParameter="{Binding FunctionName}">
+                        Command="{Binding InsertFunctionCommand}"
+                        CommandParameter="{Binding DataContext.FunctionName, RelativeSource={RelativeSource AncestorType=ListBoxItem}}">
                   <StackPanel Spacing="8"
+                              DataContext="{Binding $parent[ListBoxItem].DataContext}"
                               x:DataType="m:FunctionDefinitionItem">
                     <StackPanel Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">
                       <TextBlock FontFamily="{StaticResource MDI}" Text="{Binding Icon}" />