3
3
4
4
using CommunityToolkit . WinUI . UI ;
5
5
using Files . App . UserControls . Selection ;
6
+ using Microsoft . UI . Dispatching ;
6
7
using Microsoft . UI . Input ;
7
8
using Microsoft . UI . Xaml ;
8
9
using Microsoft . UI . Xaml . Controls ;
13
14
using Windows . Storage ;
14
15
using Windows . System ;
15
16
using Windows . UI . Core ;
16
- using DispatcherQueueTimer = Microsoft . UI . Dispatching . DispatcherQueueTimer ;
17
17
using static Files . App . Constants ;
18
- using Microsoft . UI . Dispatching ;
18
+ using DispatcherQueueTimer = Microsoft . UI . Dispatching . DispatcherQueueTimer ;
19
19
20
20
namespace Files . App . Views . LayoutModes
21
21
{
@@ -169,16 +169,8 @@ await ValidateItemNameInputTextAsync(textBox, args, (showError) =>
169
169
170
170
protected override void EndRename ( TextBox textBox )
171
171
{
172
- if ( textBox is not null && textBox . Parent is not null )
173
- {
174
- // Re-focus selected list item
175
- var listViewItem = FileList . ContainerFromItem ( RenamingItem ) as ListViewItem ;
176
- listViewItem ? . Focus ( FocusState . Programmatic ) ;
177
-
178
- var textBlock = listViewItem ? . FindDescendant ( "ItemName" ) as TextBlock ;
179
- textBox ! . Visibility = Visibility . Collapsed ;
180
- textBlock ! . Visibility = Visibility . Visible ;
181
- }
172
+ FileNameTeachingTip . IsOpen = false ;
173
+ IsRenamingItem = false ;
182
174
183
175
// Unsubscribe from events
184
176
if ( textBox is not null )
@@ -187,8 +179,19 @@ protected override void EndRename(TextBox textBox)
187
179
textBox . KeyDown -= RenameTextBox_KeyDown ;
188
180
}
189
181
190
- FileNameTeachingTip . IsOpen = false ;
191
- IsRenamingItem = false ;
182
+ if ( textBox is not null && textBox . Parent is not null )
183
+ {
184
+ ListViewItem ? listViewItem = FileList . ContainerFromItem ( RenamingItem ) as ListViewItem ;
185
+ if ( listViewItem is null )
186
+ return ;
187
+
188
+ // Re-focus selected list item
189
+ listViewItem . Focus ( FocusState . Programmatic ) ;
190
+
191
+ TextBlock ? textBlock = listViewItem . FindDescendant ( "ItemName" ) as TextBlock ;
192
+ textBox ! . Visibility = Visibility . Collapsed ;
193
+ textBlock ! . Visibility = Visibility . Visible ;
194
+ }
192
195
}
193
196
194
197
public override void ResetItemOpacity ( )
0 commit comments