Add PlaceholderForeground property to TextBox, AutoCompleteBox, CalendarDatePicker, NumericUpDown (#20303)

* Added WatermarkForeground property * Added samples * Added unit tests * Added render tests * Fix merge issues * Updated render tests * Standardize watermark foreground naming * Pending changes * More changes * Use UseFloatingPlaceholder * Fix tests
2026-02-05 17:35:47 +01:00
parent 7b54818918
commit 424863d5ff
50 changed files with 845 additions and 317 deletions
@@ -1,7 +1,7 @@
 <Window xmlns="https://github.com/avaloniaui"
        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
        x:Class="BindingDemo.MainWindow"
-        xmlns:vm="using:BindingDemo.ViewModels" 
+        xmlns:vm="using:BindingDemo.ViewModels"
        xmlns:local="using:BindingDemo"
        xmlns:system="clr-namespace:System;assembly=System.Runtime"
        Title="AvaloniaUI Bindings Test"
@@ -13,29 +13,29 @@
      <Setter Property="FontSize" Value="18"/>
    </Style>
  </Window.Styles>
-  
+
  <TabControl>
    <TabItem Header="Basic">
      <StackPanel Orientation="Vertical">
        <StackPanel Orientation="Horizontal">
          <StackPanel Margin="18" Spacing="4" Width="200">
            <TextBlock FontSize="16" Text="Simple Bindings"/>
-            <TextBox Watermark="Two Way" UseFloatingWatermark="True" Text="{Binding Path=StringValue}" Name="first"/>
-            <TextBox Watermark="Two Way (LostFocus)" UseFloatingWatermark="True" Text="{Binding Path=StringValue, UpdateSourceTrigger=LostFocus}"/>
-            <TextBox Watermark="One Way" UseFloatingWatermark="True" Text="{Binding Path=StringValue, Mode=OneWay}"/>
-            <TextBox Watermark="One Time" UseFloatingWatermark="True" Text="{Binding Path=StringValue, Mode=OneTime}"/>
+            <TextBox PlaceholderText="Two Way" UseFloatingPlaceholder="True" Text="{Binding Path=StringValue}" Name="first"/>
+            <TextBox PlaceholderText="Two Way (LostFocus)" UseFloatingPlaceholder="True" Text="{Binding Path=StringValue, UpdateSourceTrigger=LostFocus}"/>
+            <TextBox PlaceholderText="One Way" UseFloatingPlaceholder="True" Text="{Binding Path=StringValue, Mode=OneWay}"/>
+            <TextBox PlaceholderText="One Time" UseFloatingPlaceholder="True" Text="{Binding Path=StringValue, Mode=OneTime}"/>
            <!-- Removed due to #2983: reinstate when that's fixed.
-              <TextBox Watermark="One Way to Source" UseFloatingWatermark="True" Text="{Binding Path=StringValue, Mode=OneWayToSource}"/>
+              <TextBox Placeholder="One Way to Source" UseFloatingPlaceholder="True" Text="{Binding Path=StringValue, Mode=OneWayToSource}"/>
            -->
          </StackPanel>
          <StackPanel Margin="18" Spacing="4" Width="200">
            <TextBlock FontSize="16" Text="Collection Bindings"/>
-            <TextBox Watermark="Items[1].Value" UseFloatingWatermark="True" Text="{Binding Path=Items[1].Value}"/>
+            <TextBox PlaceholderText="Items[1].Value" UseFloatingPlaceholder="True" Text="{Binding Path=Items[1].Value}"/>
            <Button Command="{Binding ShuffleItems}">Shuffle</Button>
          </StackPanel>
          <StackPanel Margin="18" Spacing="4" Width="200">
            <TextBlock FontSize="16" Text="Negated Bindings"/>
-            <TextBox Watermark="Boolean String" UseFloatingWatermark="True" Text="{Binding Path=BooleanString}"/>
+            <TextBox PlaceholderText="Boolean String" UseFloatingPlaceholder="True" Text="{Binding Path=BooleanString}"/>
            <CheckBox IsChecked="{Binding !BooleanString}">!BooleanString</CheckBox>
            <CheckBox IsChecked="{Binding !!BooleanString}">!!BooleanString</CheckBox>
          </StackPanel>
@@ -43,24 +43,24 @@
        <StackPanel Orientation="Horizontal">
          <StackPanel Margin="18" Spacing="4" Width="200" HorizontalAlignment="Left">
            <TextBlock FontSize="16" Text="Numeric Bindings"/>
-            <TextBox Watermark="Double" UseFloatingWatermark="True" Text="{Binding Path=DoubleValue, Mode=TwoWay}"/>
+            <TextBox PlaceholderText="Double" UseFloatingPlaceholder="True" Text="{Binding Path=DoubleValue, Mode=TwoWay}"/>
            <TextBlock Text="{Binding Path=DoubleValue}"/>
            <ProgressBar Maximum="10" Value="{Binding DoubleValue}"/>
          </StackPanel>
          <StackPanel Margin="18" Spacing="4" Width="200" HorizontalAlignment="Left">
            <TextBlock FontSize="16" Text="Binding Sources"/>
-            <TextBox Watermark="Value of first TextBox" UseFloatingWatermark="True" 
+            <TextBox PlaceholderText="Value of first TextBox" UseFloatingPlaceholder="True"
                     Text="{Binding #first.Text, Mode=TwoWay}"/>
-            <TextBox Watermark="Value of SharedItem.StringValue" UseFloatingWatermark="True"
+            <TextBox PlaceholderText="Value of SharedItem.StringValue" UseFloatingPlaceholder="True"
                     Text="{Binding Value, Source={StaticResource SharedItem}, Mode=TwoWay, DataType={x:Type vm:MainWindowViewModel+TestItem, x:TypeArguments=x:String}}"/>
-            <TextBox Watermark="Value of SharedItem.StringValue (duplicate)" UseFloatingWatermark="True"
+            <TextBox PlaceholderText="Value of SharedItem.StringValue (duplicate)" UseFloatingPlaceholder="True"
                     Text="{Binding Value, Source={StaticResource SharedItem}, Mode=TwoWay, DataType={x:Type vm:MainWindowViewModel+TestItem, x:TypeArguments=x:String}}"/>
          </StackPanel>
          <StackPanel Margin="18" Spacing="4" Width="200" HorizontalAlignment="Left">
            <TextBlock FontSize="16" Text="Scheduler"/>
-            <TextBox Watermark="Background Thread" Text="{Binding CurrentTime, Mode=OneWay}"/>
+            <TextBox PlaceholderText="Background Thread" Text="{Binding CurrentTime, Mode=OneWay}"/>
            <TextBlock FontSize="16" Text="Stream Operator"/>
-            <TextBox Watermark="StreamOperator" Text="{CompiledBinding CurrentTimeObservable^, Mode=OneWay}"/>
+            <TextBox PlaceholderText="StreamOperator" Text="{CompiledBinding CurrentTimeObservable^, Mode=OneWay}"/>
          </StackPanel>
        </StackPanel>
      </StackPanel>
@@ -91,19 +91,19 @@
    </TabItem>
    <TabItem Header="Property Validation">
      <StackPanel Orientation="Horizontal">
-        <StackPanel Margin="18" Spacing="4" MinWidth="200" DataContext="{Binding ExceptionDataValidation}">
+         <StackPanel Margin="18" Spacing="4" MinWidth="200" DataContext="{Binding ExceptionDataValidation}">
          <TextBlock FontSize="16" Text="Exception Validation"/>
-          <TextBox Watermark="Less Than 10" UseFloatingWatermark="True" Text="{Binding Path=LessThan10}"/>
+          <TextBox PlaceholderText="Less Than 10" UseFloatingPlaceholder="True" Text="{Binding Path=LessThan10}"/>
        </StackPanel>
        <StackPanel Margin="18" Spacing="4" MinWidth="200" DataContext="{Binding IndeiDataValidation}">
          <TextBlock FontSize="16" Text="INotifyDataErrorInfo Validation"/>
-          <TextBox Watermark="Maximum" UseFloatingWatermark="True" Text="{Binding Path=Maximum}"/>
-          <TextBox Watermark="Value" UseFloatingWatermark="True" Text="{Binding Path=Value}"/>
+            <TextBox PlaceholderText="Maximum" UseFloatingPlaceholder="True" Text="{Binding Path=Maximum}"/>
+            <TextBox PlaceholderText="Value" UseFloatingPlaceholder="True" Text="{Binding Path=Value}"/>
        </StackPanel>
-        <StackPanel Margin="18" Spacing="4" MinWidth="200" DataContext="{Binding DataAnnotationsValidation}">
+         <StackPanel Margin="18" Spacing="4" MinWidth="200" DataContext="{Binding DataAnnotationsValidation}">
          <TextBlock FontSize="16" Text="Data Annotations Validation"/>
-          <TextBox Watermark="Phone #" UseFloatingWatermark="True" Text="{Binding PhoneNumber}"/>
-          <TextBox Watermark="Less Than 10" UseFloatingWatermark="True" Text="{Binding Path=LessThan10}"/>
+          <TextBox PlaceholderText="Phone #" UseFloatingPlaceholder="True" Text="{Binding PhoneNumber}"/>
+          <TextBox PlaceholderText="Less Than 10" UseFloatingPlaceholder="True" Text="{Binding Path=LessThan10}"/>
        </StackPanel>
      </StackPanel>
    </TabItem>
@@ -39,8 +39,12 @@
        <AutoCompleteBox MaxDropDownHeight="60" />
      </StackPanel>
      <StackPanel>
-        <TextBlock Text="Watermark" />
-        <AutoCompleteBox Watermark="Hello World" />
+        <TextBlock Text="PlaceholderText" />
+        <AutoCompleteBox PlaceholderText="Hello World" />
+      </StackPanel>
+      <StackPanel>
+        <TextBlock Text="PlaceholderText with custom color" />
+        <AutoCompleteBox PlaceholderText="Search here..." PlaceholderForeground="Green" />
      </StackPanel>
      <StackPanel>
        <TextBlock Text="Disabled" />
@@ -5,7 +5,7 @@
             x:Class="ControlCatalog.Pages.CalendarDatePickerPage">
  <StackPanel Orientation="Vertical" Spacing="4">
    <TextBlock Classes="h2">A control for selecting dates with a calendar drop-down</TextBlock>
-        
+
    <StackPanel Orientation="Horizontal"
                Margin="0,16,0,0"
                HorizontalAlignment="Center"
@@ -32,19 +32,24 @@
                    Margin="0,0,0,8"/>

        <CalendarDatePicker Margin="0,0,0,8"
-                    Watermark="Watermark"/>
+                    PlaceholderText="Placeholder"/>
        <CalendarDatePicker Margin="0,0,0,8"
                    Name="DatePicker5"
-                    Watermark="Floating Watermark"
-                    UseFloatingWatermark="True"/>
-                
+                    PlaceholderText="Floating Placeholder"
+                    UseFloatingPlaceholder="True"/>
+
+        <TextBlock Text="PlaceholderText with custom color"/>
+        <CalendarDatePicker Margin="0,0,0,8"
+                    PlaceholderText="Select a date"
+                    PlaceholderForeground="Purple"/>
+
        <TextBlock Text="Disabled"/>
        <CalendarDatePicker IsEnabled="False"/>
-        
+
        <TextBlock Text="Validation Example"/>
        <CalendarDatePicker SelectedDate="{CompiledBinding ValidatedDateExample, Mode=TwoWay}"/>
      </StackPanel>

-    </StackPanel> 
+    </StackPanel>
  </StackPanel>
 </UserControl>
@@ -1,4 +1,4 @@
-<UserControl x:Class="ControlCatalog.Pages.ClipboardPage"
+<UserControl x:Class="ControlCatalog.Pages.ClipboardPage"
             xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
  <StackPanel Orientation="Vertical" Spacing="4">
@@ -21,7 +21,7 @@
    <TextBox x:Name="ClipboardContent"
             MinHeight="100"
             AcceptsReturn="True"
-             Watermark="Text to copy of file names per line" />
+             PlaceholderText="Text to copy of file names per line" />
    <Viewbox Width="420" Height="360">
      <Image x:Name="ClipboardImage"
      />
@@ -58,17 +58,17 @@
        <Button Name="OpenBoth">Select _Both</Button>
      </StackPanel>
    </Expander>
-    
+
    <Expander Header="Launcher dialogs">
      <StackPanel Spacing="4">
-        <TextBox Name="UriToLaunch" Watermark="Uri to launch" Text="https://avaloniaui.net/" />
+        <TextBox Name="UriToLaunch" PlaceholderText="Uri to launch" Text="https://avaloniaui.net/" />
        <Button Name="LaunchUri">Launch Uri</Button>
        <Button Name="LaunchFile">Launch File</Button>
        <TextBlock Name="LaunchStatus" />
      </StackPanel>
    </Expander>

-    <AutoCompleteBox x:Name="CurrentFolderBox" Watermark="Write full path/uri or well known folder name">
+    <AutoCompleteBox x:Name="CurrentFolderBox" PlaceholderText="Write full path/uri or well known folder name">
      <AutoCompleteBox.ItemsSource>
        <generic:List x:TypeArguments="storage:WellKnownFolder">
          <storage:WellKnownFolder>Desktop</storage:WellKnownFolder>
@@ -80,17 +80,17 @@
        </generic:List>
      </AutoCompleteBox.ItemsSource>
    </AutoCompleteBox>
-    
+
    <TextBlock x:Name="PickerLastResultsVisible"
               Classes="h2"
               IsVisible="False"
               Text="Last picker results:" />
    <ItemsControl x:Name="PickerLastResults" />

-    <TextBox Name="BookmarkContainer" Watermark="Bookmark" />
+    <TextBox Name="BookmarkContainer" PlaceholderText="Bookmark" />
    <TextBox Name="OpenedFileContent"
             MaxLines="10"
-             Watermark="Picked file content" />
+             PlaceholderText="Picked file content" />

  </StackPanel>
 </UserControl>
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:sys="using:System"
             xmlns:converter="using:ControlCatalog.Converter"
@@ -48,8 +48,8 @@
        <ComboBox x:Name="CultureSelector" Grid.Row="2" Grid.Column="1" ItemsSource="{Binding Cultures}"
                  VerticalAlignment="Center" Margin="2"/>

-        <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="2">Watermark:</TextBlock>
-        <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding #upDown.Watermark}" VerticalAlignment="Center" Margin="2" />
+        <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="2">PlaceholderText:</TextBlock>
+        <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding #upDown.PlaceholderText}" VerticalAlignment="Center" Margin="2" />

        <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="2">Text:</TextBlock>
        <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding #upDown.Text}" VerticalAlignment="Center" Margin="2" />
@@ -81,23 +81,23 @@
        <NumericUpDown Name="upDown" Minimum="0" Maximum="10" Increment="0.5"
                       NumberFormat="{Binding #CultureSelector.SelectedItem, Converter={x:Static pages:NumericUpDownPage.CultureConverter}}"
                       VerticalAlignment="Center" Value="{Binding DecimalValue}"
-                       Watermark="Enter text" FormatString="{Binding SelectedFormat.Value}"/>
+                       PlaceholderText="Enter text" FormatString="{Binding SelectedFormat.Value}"/>
      </StackPanel>

      <StackPanel Orientation="Vertical" Margin="10">
        <Label Target="DoubleUpDown" FontSize="14" FontWeight="Bold" VerticalAlignment="Center">Usage of double NumericUpDown:</Label>
        <NumericUpDown Name="DoubleUpDown" Minimum="0" Maximum="10" Increment="0.5"
                       VerticalAlignment="Center" Value="{Binding DoubleValue}"
-                       Watermark="Enter text" FormatString="{Binding SelectedFormat.Value}"/>
+                       PlaceholderText="Enter text" FormatString="{Binding SelectedFormat.Value}"/>
      </StackPanel>
-      
+
      <StackPanel Orientation="Vertical" Margin="10">
        <Label Target="ValidationUpDown" FontSize="14" FontWeight="Bold" VerticalAlignment="Center">NumericUpDown with Validation Errors:</Label>
        <NumericUpDown x:Name="ValidationUpDown" Minimum="0" Maximum="10" Increment="0.5"
                       VerticalAlignment="Center"
-                       Watermark="Enter text" FormatString="{Binding SelectedFormat.Value}">
+                       PlaceholderText="Enter text" FormatString="{Binding SelectedFormat.Value}">
          <DataValidationErrors.Error>
-            <sys:Exception /> 
+            <sys:Exception />
          </DataValidationErrors.Error>
        </NumericUpDown>
      </StackPanel>
@@ -110,10 +110,18 @@
            <converter:HexConverter></converter:HexConverter>
          </NumericUpDown.TextConverter>
        </NumericUpDown>
-        
+
      </StackPanel>
    </WrapPanel>

+    <StackPanel Orientation="Vertical" Margin="10">
+      <Label FontSize="14" FontWeight="Bold" Target="PlaceholderForegroundUpDown"
+             Content="Placeholder with custom foreground color:"/>
+      <NumericUpDown x:Name="PlaceholderForegroundUpDown"
+                     PlaceholderText="Enter amount"
+                     PlaceholderForeground="Orange"/>
+    </StackPanel>
+
    <StackPanel Margin="10">
      <Label FontSize="14" FontWeight="Bold" Target="InnerContent"
             Content="Inner Contents"/>
@@ -17,34 +17,41 @@
            </Flyout>
          </TextBox.ContextFlyout>
        </TextBox>
-        <TextBox Width="200" Watermark="ReadOnly" IsReadOnly="True" Text="This is read only"/>
-        <TextBox Width="200" Watermark="Numeric with watermark" TextInputOptions.ContentType="Number" />
+        <TextBox Width="200" PlaceholderText="ReadOnly" IsReadOnly="True" Text="This is read only"/>
+        <TextBox Width="200" PlaceholderText="Numeric with placeholder" TextInputOptions.ContentType="Number" />
        <TextBox Width="200"
-                 Watermark="Floating Watermark"
-                 UseFloatingWatermark="True"
+                 PlaceholderText="Floating Placeholder"
+                 UseFloatingPlaceholder="True"
                 Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit."/>
+        <TextBox Width="200"
+                 PlaceholderText="Custom Placeholder Color"
+                 PlaceholderForeground="Red"/>
+        <TextBox Width="200"
+                 PlaceholderText="Floating Placeholder Color"
+                 UseFloatingPlaceholder="True"
+                 PlaceholderForeground="Purple"/>
        <MaskedTextBox Width="200" ResetOnSpace="False"  Mask="(LLL) 999-0000"/>
-        
+
        <TextBox Width="200" Text="Validation Error">
          <DataValidationErrors.Error>
-            <sys:Exception /> 
+            <sys:Exception />
          </DataValidationErrors.Error>
        </TextBox>

        <TextBox Width="200"
-                 Watermark="Password Box"
+                 PlaceholderText="Password Box"
                 Classes="revealPasswordButton"
                 TextInputOptions.ContentType="Password"
-                 UseFloatingWatermark="True"
+                 UseFloatingPlaceholder="True"
                 PasswordChar="*"
                 Text="Password" />
-        <TextBox Width="200" Watermark="Suggestions are hidden" TextInputOptions.ShowSuggestions="False" />
+        <TextBox Width="200" PlaceholderText="Suggestions are hidden" TextInputOptions.ShowSuggestions="False" />
        <TextBox Width="200" Text="Left aligned text" TextAlignment="Left" AcceptsTab="True" />
        <TextBox Width="200" Text="Center aligned text" TextAlignment="Center" />
        <TextBox Width="200" Text="Right aligned text" TextAlignment="Right" />
        <TextBox Width="200" Text="Custom selection brush"
-                  SelectionStart="5" SelectionEnd="22"
-                  SelectionBrush="Green" SelectionForegroundBrush="Yellow" ClearSelectionOnLostFocus="False"/>
+                 SelectionStart="5" SelectionEnd="22"
+                 SelectionBrush="Green" SelectionForegroundBrush="Yellow" ClearSelectionOnLostFocus="False"/>
        <TextBox Width="200" Text="Custom caret brush" CaretBrush="DarkOrange"/>
      </StackPanel>

@@ -54,11 +61,11 @@
        <TextBox AcceptsReturn="True" Width="200" Height="125"
                 Text="Multiline TextBox with no TextWrapping.&#xD;&#xD;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est." />

-        <TextBox Classes="clearButton" Text="Clear Content" Width="200" FontWeight="Normal" FontStyle="Normal" Watermark="Watermark" FontFamily="avares://ControlCatalog/Assets/Fonts#Source Sans Pro"/>
+        <TextBox Classes="clearButton" Text="Clear Content" Width="200" FontWeight="Normal" FontStyle="Normal" PlaceholderText="Placeholder" FontFamily="avares://ControlCatalog/Assets/Fonts#Source Sans Pro"/>
        <TextBox Text="IME small font" Width="200"
-         FontFamily="Comic Sans MS"
-         FontSize="10"
-         Foreground="Red"/>
+                 FontFamily="Comic Sans MS"
+                 FontSize="10"
+                 Foreground="Red"/>
        <TextBox Text="IME large font" Width="200"
                 FontFamily="Comic Sans MS"
                 FontSize="22"
@@ -67,9 +74,9 @@
                 FontFamily="Comic Sans MS"
                 InputMethod.IsInputMethodEnabled="False"
                 Foreground="Red"/>
-        <TextBox AcceptsReturn="True" 
-                 TextWrapping="Wrap" 
-                 Width="200" 
+        <TextBox AcceptsReturn="True"
+                 TextWrapping="Wrap"
+                 Width="200"
                 Height="125"
                 LineHeight="32"
                 Text="Multiline TextBox with TextWrapping and increased LineHeight.&#xD;&#xD;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est." />
@@ -1,4 +1,4 @@
-<UserControl x:Class="ControlCatalog.Pages.ThemePage"
+<UserControl x:Class="ControlCatalog.Pages.ThemePage"
             xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -70,8 +70,8 @@
        </ComboBox>
        <TextBlock Grid.Column="0" Grid.Row="2" Text="Username:" VerticalAlignment="Center" />
        <TextBlock Grid.Column="0" Grid.Row="4" Text="Password:" VerticalAlignment="Center" />
-        <TextBox Grid.Column="1" Grid.Row="2" Watermark="Input here" HorizontalAlignment="Stretch" />
-        <TextBox Grid.Column="1" Grid.Row="4" Watermark="Input here" HorizontalAlignment="Stretch" />
+        <TextBox Grid.Column="1" Grid.Row="2" PlaceholderText="Input here" HorizontalAlignment="Stretch" />
+        <TextBox Grid.Column="1" Grid.Row="4" PlaceholderText="Input here" HorizontalAlignment="Stretch" />
        <Button Grid.Column="1" Grid.Row="6" Content="Login" HorizontalAlignment="Stretch" />
      </Grid>
    </Border>
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        xmlns:controls="using:Generators.Sandbox.Controls"
        xmlns:vm="clr-namespace:Generators.Sandbox.ViewModels"
@@ -17,8 +17,8 @@
        <controls:CustomTextBox Margin="0 10 0 0"
                 x:Name="UserNameTextBox"
                 Text="{Binding UserName}"
-                 Watermark="Please, enter user name..."
-                 UseFloatingWatermark="True" />
+                  PlaceholderText="Please, enter user name..."
+                  UseFloatingPlaceholder="True" />
        <TextBlock x:Name="UserNameValidation"
                   Text="{Binding UserNameValidation}"
                   Foreground="Green"
@@ -26,8 +26,8 @@
        <TextBox Margin="0 10 0 0"
                 x:Name="PasswordTextBox"
                 Text="{Binding Password}"
-                 Watermark="Please, enter your password..."
-                 UseFloatingWatermark="True"
+                 PlaceholderText="Please, enter your password..."
+                 UseFloatingPlaceholder="True"
                 PasswordChar="*" />
        <TextBlock x:Name="PasswordValidation"
                   Text="{Binding PasswordValidation}"
@@ -36,8 +36,8 @@
        <TextBox Margin="0 10 0 0"
                 x:Name="ConfirmPasswordTextBox"
                 Text="{Binding ConfirmPassword}"
-                 Watermark="Please, confirm the password..."
-                 UseFloatingWatermark="True"
+                 PlaceholderText="Please, confirm the password..."
+                 UseFloatingPlaceholder="True"
                 PasswordChar="*" />
        <TextBlock x:Name="ConfirmPasswordValidation"
                   Text="{Binding ConfirmPasswordValidation}"
@@ -8,12 +8,12 @@
    <Button Name="ScreenRefresh"
            Content="Refresh"
            Click="ScreenRefresh_Click"/>
-    <TextBox Name="ScreenName" Watermark="DisplayName" UseFloatingWatermark="true" />
-    <TextBox Name="ScreenHandle" Watermark="Handle" UseFloatingWatermark="true" />
-    <TextBox Name="ScreenScaling" Watermark="Scaling" UseFloatingWatermark="true" />
-    <TextBox Name="ScreenBounds" Watermark="Bounds" UseFloatingWatermark="true" />
-    <TextBox Name="ScreenWorkArea" Watermark="WorkArea" UseFloatingWatermark="true" />
-    <TextBox Name="ScreenOrientation" Watermark="Orientation" UseFloatingWatermark="true" />
-    <TextBox Name="ScreenSameReference" Watermark="Is same reference" UseFloatingWatermark="true" />
+    <TextBox Name="ScreenName" PlaceholderText="DisplayName" UseFloatingPlaceholder="true" />
+    <TextBox Name="ScreenHandle" PlaceholderText="Handle" UseFloatingPlaceholder="true" />
+    <TextBox Name="ScreenScaling" PlaceholderText="Scaling" UseFloatingPlaceholder="true" />
+    <TextBox Name="ScreenBounds" PlaceholderText="Bounds" UseFloatingPlaceholder="true" />
+    <TextBox Name="ScreenWorkArea" PlaceholderText="WorkArea" UseFloatingPlaceholder="true" />
+    <TextBox Name="ScreenOrientation" PlaceholderText="Orientation" UseFloatingPlaceholder="true" />
+    <TextBox Name="ScreenSameReference" PlaceholderText="Is same reference" UseFloatingPlaceholder="true" />
  </StackPanel>
 </UserControl>
@@ -10,7 +10,7 @@
    <CheckBox Name="WindowPreferSystemChrome" Content="Prefer SystemChrome" />
    <CheckBox Name="WindowMacThickSystemChrome" Content="Mac Thick SystemChrome" />
    <CheckBox Name="WindowShowTitleAreaControl" Content="Show Title Area Control" />
-    <TextBox Name="WindowTitleBarHeightHint" Text="-1" Watermark="In dips" />
+    <TextBox Name="WindowTitleBarHeightHint" Text="-1" PlaceholderText="In dips" />
    <Button Name="ApplyWindowDecorations"
            Content="Apply decorations on this Window"
            Click="ApplyWindowDecorations_Click"/>
@@ -6,7 +6,7 @@
             x:Class="IntegrationTestApp.Pages.WindowPage">
  <Grid ColumnDefinitions="*,8,*">
    <StackPanel Grid.Column="0">
-      <TextBox Name="ShowWindowSize" Watermark="Window Size"/>
+      <TextBox Name="ShowWindowSize" PlaceholderText="Window Size"/>
      <ComboBox Name="ShowWindowMode" SelectedIndex="0">
        <ComboBoxItem>NonOwned</ComboBoxItem>
        <ComboBoxItem>Owned</ComboBoxItem>
@@ -24,7 +24,7 @@
            <Label Margin="5"
                   Foreground="Red"
                   VerticalAlignment="Bottom"
-                   HorizontalContentAlignment="Right">View Bounds</Label>                
+                   HorizontalContentAlignment="Right">View Bounds</Label>
            </Grid>
        </Border>
        <Border BorderBrush="LimeGreen"
@@ -47,7 +47,7 @@
                        <CheckBox IsChecked="{Binding UseSafeArea}" IsEnabled="{Binding !AutoSafeAreaPadding}">Use Safe Area</CheckBox>
                        <CheckBox IsChecked="{Binding AutoSafeAreaPadding}">Automatic Paddings</CheckBox>
                        <CheckBox IsChecked="{Binding HideSystemBars}">Hide System Bars</CheckBox>
-                        <TextBox Width="200" Watermark="Tap to Show Keyboard"/>
+                         <TextBox Width="200" PlaceholderText="Tap to Show Keyboard"/>
                    </StackPanel>
                </Grid>
            </DockPanel>
@@ -5,10 +5,10 @@
             x:DataType="local:MainView">
  <StackPanel Margin="100 50" Spacing="50">
    <TextBlock Text="Login" Foreground="White" />
-    <TextBox TextInputOptions.Multiline="True" AcceptsReturn="True" Watermark="Text" Height="200" TextWrapping="Wrap"/>
-    <TextBox Watermark="Username" TextInputOptions.ContentType="Email" TextInputOptions.ReturnKeyType="Done" />
-    <TextBox Watermark="Password" PasswordChar="*" TextInputOptions.ContentType="Password" />
-    <TextBox Watermark="Pin" PasswordChar="*" TextInputOptions.ContentType="Digits" TextInputOptions.ReturnKeyType="Next" />
+    <TextBox TextInputOptions.Multiline="True" AcceptsReturn="True" PlaceholderText="Text" Height="200" TextWrapping="Wrap"/>
+    <TextBox PlaceholderText="Username" TextInputOptions.ContentType="Email" TextInputOptions.ReturnKeyType="Done" />
+    <TextBox PlaceholderText="Password" PasswordChar="*" TextInputOptions.ContentType="Password" />
+    <TextBox PlaceholderText="Pin" PasswordChar="*" TextInputOptions.ContentType="Digits" TextInputOptions.ReturnKeyType="Next" />
    <Button Content="Login" Command="{Binding ButtonCommand}" />
  </StackPanel>
 </UserControl>