Merge branch 'dev' into ROU-4483

OutSystems · Aug 28, 2023 · 35606e4 · 35606e4
2 parents 44198ed + 5dcb618
commit 35606e4
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 18 deletions.
diff --git a/dist/OutSystemsUI.css b/dist/OutSystemsUI.css
@@ -793,7 +793,8 @@ body,
 }
 .phone .layout .main-content .layout.layout-native{
   -servicestudio-min-width:100vw;
-} /*! 3.2. Header */
+}
+/*! 3.2. Header */
 .header{
   background-color:var(--header-color);
   -webkit-box-shadow:0 1px 5px 0 rgba(21, 24, 26, 0.1);
@@ -4650,7 +4651,7 @@ span.flatpickr-weekday{
 }
 /*! 5.4. VirtualSelect */
 /*!
- * Virtual Select v1.0.39
+ * Virtual Select v1.0.40
  * https://sa-si-dev.github.io/virtual-select
  * Licensed under MIT (https://github.com/sa-si-dev/virtual-select/blob/master/LICENSE)
  */
@@ -8467,15 +8468,18 @@ span.flatpickr-weekday{
   display:none;
   -moz-appearance:none;
 }
-.osui-datepicker input:first-of-type{
-  display:none !important;
-}
 .osui-datepicker input.flatpickr-input[disabled] + input{
   background-color:var(--color-neutral-2);
   border:var(--border-size-s) solid var(--color-neutral-4);
   color:var(--color-neutral-6);
   pointer-events:none;
 }
+.osui-datepicker > span > input:first-of-type{
+  display:none !important;
+}
+.osui-datepicker > span > input:first-of-type{
+  -servicestudio-display:inline-flex !important;
+}
 .osui-datepicker-calendar-ss-preview{
   display:none;
 }
@@ -9555,15 +9559,18 @@ body.vscomp-popup-active .vscomp-wrapper{
 .osui-monthpicker .not-valid + .flatpickr-mobile{
   border-color:var(--color-error);
 }
-.osui-monthpicker input:first-of-type{
-  display:none !important;
-}
 .osui-monthpicker input[disabled] + input{
   background-color:var(--color-neutral-2);
   border:var(--border-size-s) solid var(--color-neutral-4);
   color:var(--color-neutral-6);
   pointer-events:none;
 }
+.osui-monthpicker > span > input:first-of-type{
+  display:none !important;
+}
+.osui-monthpicker > span > input:first-of-type{
+  -servicestudio-display:inline-flex !important;
+}
 .form .osui-monthpicker-ss-preview{
   -servicestudio-margin-top:-22px;
 }
@@ -10517,22 +10524,25 @@ body.vscomp-popup-active .vscomp-wrapper{
   display:none;
   -moz-appearance:none;
 }
-.osui-timepicker input:first-of-type{
-  display:none !important;
-}
 .osui-timepicker input.flatpickr-input[disabled] + input{
   background-color:var(--color-neutral-2);
   border:var(--border-size-s) solid var(--color-neutral-4);
   color:var(--color-neutral-6);
   pointer-events:none;
 }
+.osui-timepicker > span > input:first-of-type{
+  display:none !important;
+}
+.osui-timepicker > span > input:first-of-type{
+  -servicestudio-display:inline-flex !important;
+}
 .osui-timepicker__dropdown-ss-preview{
   display:none;
   -servicestudio-display:none;
 }
 .osui-timepicker__dropdown-ss-preview{
   -servicestudio-background-color:transparent;
-  -servicestudio-background-position:top center;
+  -servicestudio-background-position:top left;
   -servicestudio-background-repeat:no-repeat;
   -servicestudio-background-size:contain;
   -servicestudio-border-radius:var(--border-radius-soft);

diff --git a/dist/OutSystemsUI.d.ts b/dist/OutSystemsUI.d.ts
@@ -5432,7 +5432,7 @@ declare namespace Providers.OSUI.Dropdown.VirtualSelect {
 declare namespace Providers.OSUI.Dropdown.VirtualSelect.Enum {
     enum ProviderInfo {
         Name = "VirtualSelect",
-        Version = "1.0.39"
+        Version = "1.0.40"
     }
     enum CssClass {
         ErrorMessage = "osui-dropdown-error-message",

diff --git a/dist/OutSystemsUI.js b/dist/OutSystemsUI.js
@@ -17695,7 +17695,7 @@ var Providers;
                             return _finalDate;
                         }
                         else {
-                            return OSFramework.OSUI.Helper.Dates.NormalizeDateTime(_finalDate);
+                            return OSFramework.OSUI.Helper.Dates.NormalizeDateTime(_finalDate, date === this.MaxDate);
                         }
                     }
                     getProviderConfig() {
@@ -19034,7 +19034,7 @@ var Providers;
                     let ProviderInfo;
                     (function (ProviderInfo) {
                         ProviderInfo["Name"] = "VirtualSelect";
-                        ProviderInfo["Version"] = "1.0.39";
+                        ProviderInfo["Version"] = "1.0.40";
                     })(ProviderInfo = Enum.ProviderInfo || (Enum.ProviderInfo = {}));
                     let CssClass;
                     (function (CssClass) {

diff --git a/package.json b/package.json
@@ -67,4 +67,4 @@
 		"typescript": "^4.5.0",
 		"virtual-select-plugin": "1.0.40"
 	}
-}
+}
diff --git a/src/scripts/Providers/OSUI/Datepicker/Flatpickr/AbstractFlatpickrConfig.ts b/src/scripts/Providers/OSUI/Datepicker/Flatpickr/AbstractFlatpickrConfig.ts
@@ -169,7 +169,7 @@ namespace Providers.OSUI.Datepicker.Flatpickr {
 			} else if (this._isUsingDateTime) {
 				return _finalDate;
 			} else {
-				return OSFramework.OSUI.Helper.Dates.NormalizeDateTime(_finalDate);
+				return OSFramework.OSUI.Helper.Dates.NormalizeDateTime(_finalDate, date === this.MaxDate);
 			}
 		}
 

diff --git a/src/scripts/Providers/OSUI/Dropdown/VirtualSelect/AbstractVirtualSelectEnum.ts b/src/scripts/Providers/OSUI/Dropdown/VirtualSelect/AbstractVirtualSelectEnum.ts
@@ -5,7 +5,7 @@ namespace Providers.OSUI.Dropdown.VirtualSelect.Enum {
 	 */
 	export enum ProviderInfo {
 		Name = 'VirtualSelect',
-		Version = '1.0.39',
+		Version = '1.0.40',
 	}
 
 	/**