Merge pull request #515 from telerik/development

Merge development into master
telerik · Jan 19, 2023 · 2e8b6ee · 2e8b6ee
2 parents e73f5e3 + dd32b70
commit 2e8b6ee
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/BuildTools/BuildNuGet.bat b/BuildTools/BuildNuGet.bat
@@ -1,2 +1,2 @@
 SET MSBUILD=%WINDIR%\microsoft.net\framework\v4.0.30319\MSBuild.exe
-%MSBUILD% BuildNuget.UWP.proj /property:Version=1.0.2.9
+%MSBUILD% BuildNuget.UWP.proj /property:Version=1.0.2.10
diff --git a/BuildTools/BuildNuget.UWP.proj b/BuildTools/BuildNuget.UWP.proj
@@ -15,7 +15,7 @@
     <Target Name="PrepareNugetProperties">
 
         <PropertyGroup>
-            <Version Condition= " '$(Version)' == '' ">1.0.2.9</Version>
+            <Version Condition= " '$(Version)' == '' ">1.0.2.10</Version>
             <FullPathDeployDirectory>$([System.IO.Path]::GetFullPath('$(DeployDirectory)'))</FullPathDeployDirectory>
             <BinariesSubDir>$(BinariesTargetDirectory)</BinariesSubDir>
 

diff --git a/BuildTools/Nuspecs.UWP/Package.UniversalWindowsPlatform.nuspec b/BuildTools/Nuspecs.UWP/Package.UniversalWindowsPlatform.nuspec
@@ -12,7 +12,7 @@
     <icon>images\uwp.png</icon>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>UI for Universal Windows Platform is a toolset for building Universal Windows Platform apps for the Windows Store and the enterprise. The library is designed to offer the same user experience, functionality and behavior on Windows devices of all form factors.</description>
-    <releaseNotes>For full release notes see https://github.com/telerik/UI-For-UWP/releases/tag/1.0.2.9</releaseNotes>
+    <releaseNotes>For full release notes see https://github.com/telerik/UI-For-UWP/releases/tag/1.0.2.10</releaseNotes>
     <tags>UWP Windows Telerik Controls XAML C#</tags>
     <language>en-US</language>
   </metadata>

diff --git a/Controls/Grid/Grid.UWP/View/Services/Editing/EditingService.cs b/Controls/Grid/Grid.UWP/View/Services/Editing/EditingService.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -85,7 +85,7 @@ public bool BeginEdit(ItemInfo rowInfo)
                         this.Owner.EditRowLayer.ScheduleFirstEditorForFocus();
                     }
 
-                    this.Owner.Model.CurrentDataProvider.CommitEditOperation(this.EditItem);
+                    this.Owner.Model.CurrentDataProvider.BeginEditOperation(this.EditItem);
 
                     // hide the CurrentItem decoration
                     this.Owner.visualStateService.UpdateCurrentDecoration(-1); 
@@ -189,19 +189,19 @@ public bool CancelEdit(ActionTrigger trigger)
                     this.Owner.EditRowLayer.EditorLayoutSlots.Clear();
                 }
 
-                this.Owner.Model.CurrentDataProvider.CommitEditOperation(this.EditItem);
+                this.Owner.Model.CurrentDataProvider.CancelEditOperation(this.EditItem);
             })
             {
                 Flags = UpdateFlags.AffectsContent
             };
 
-            this.Owner.updateService.RegisterUpdate(update);
-
             foreach (var pair in this.operation.OriginalValues)
             {
                 pair.Key.SetValueForInstance(this.operation.EditItemInfo.Item, pair.Value);
             }
 
+            this.Owner.updateService.RegisterUpdate(update);
+
             if (this.operation.EditMode == DataGridUserEditMode.Inline)
             {
                 this.Owner.EditRowLayer.EditorLayoutSlots.Clear();

diff --git a/Controls/Primitives/Primitives.UWP/SideDrawer/RadSideDrawer.cs b/Controls/Primitives/Primitives.UWP/SideDrawer/RadSideDrawer.cs
@@ -705,7 +705,7 @@ private static void OnDrawerStateChanged(DependencyObject d, DependencyPropertyC
             var sideDrawer = d as RadSideDrawer;
             var mainContent = sideDrawer.MainContent as FrameworkElement;
 
-            if (mainContent != null)
+            if (mainContent != null && sideDrawer.TapOutsideToClose)
             {
                 mainContent.IsHitTestVisible = (DrawerState)e.NewValue == DrawerState.Closed;
             }
@@ -742,7 +742,7 @@ private static void OnDrawerTransitionFadeOpacityChanged(DependencyObject d, Dep
 
             if (sideDrawer.IsTemplateApplied)
             {
-                sideDrawer.InvalidateMeasure();
+                sideDrawer.ResetDrawer();
             }
         }
         private static void OnIsOpenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright © 2015-2019 Progress Software Corporation and/or one of its subsidiaries or affiliates. All rights reserved.
+Copyright © 2015-2023 Progress Software Corporation and/or one of its subsidiaries or affiliates. All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/notice.txt b/notice.txt
@@ -4,6 +4,6 @@
    ==  in this case for Telerik UI for UWP by Progress	     	 	  ==
    =========================================================================
 Telerik UI for UWP by Progress
-Copyright (C) 2015 - 2019 Progress Software Corporation
+Copyright (C) 2015 - 2023 Progress Software Corporation
 For license information see the LICENSE.md file which accompanies this NOTICE.txt file.
 Any open source software that may be delivered by Progress Software Corporation embedded in or in association with Telerik UI for UWP by Progress is provided pursuant to the open source license applicable to such software and subject to the disclaimers and limitations on liability set forth in such license.