From 65cd438e0f6a5741720236fdc01ea304d3a7d390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=CC=81=20Rio?= Date: Mon, 21 Aug 2023 13:07:01 +0100 Subject: [PATCH 1/2] Added validation when date should not be normalized into MaxDate. --- .../OSUI/Datepicker/Flatpickr/AbstractFlatpickrConfig.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/Providers/OSUI/Datepicker/Flatpickr/AbstractFlatpickrConfig.ts b/src/scripts/Providers/OSUI/Datepicker/Flatpickr/AbstractFlatpickrConfig.ts index 831e1e6759..112dd2c6e7 100644 --- 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); } } From d35a6c6cdbb90429410d7ff1cef1b52d498d4ed6 Mon Sep 17 00:00:00 2001 From: gbnm Date: Fri, 25 Aug 2023 21:44:52 +0100 Subject: [PATCH 2/2] Update Virtual Select v1.0.40 --- dist/OutSystemsUI.css | 34 ++++++++++++------- dist/OutSystemsUI.d.ts | 2 +- dist/OutSystemsUI.js | 4 +-- package.json | 4 +-- .../AbstractVirtualSelectEnum.ts | 2 +- .../scss/_virtualselect_lib.scss | 22 +++++++++--- 6 files changed, 45 insertions(+), 23 deletions(-) diff --git a/dist/OutSystemsUI.css b/dist/OutSystemsUI.css index c726003d04..385aaac002 100644 --- 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 index f697439b94..0dd77327b0 100644 --- 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 index b3d53891ce..c5760b5dd4 100644 --- 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 index 1a5d5c3fa7..a70b7c1b1e 100644 --- a/package.json +++ b/package.json @@ -65,6 +65,6 @@ "typedoc-plugin-merge-modules": "^4.0.1", "typedoc-umlclass": "^0.7.0", "typescript": "^4.5.0", - "virtual-select-plugin": "1.0.39" + "virtual-select-plugin": "1.0.40" } -} +} \ No newline at end of file diff --git a/src/scripts/Providers/OSUI/Dropdown/VirtualSelect/AbstractVirtualSelectEnum.ts b/src/scripts/Providers/OSUI/Dropdown/VirtualSelect/AbstractVirtualSelectEnum.ts index c9a88e3905..db06e6e019 100644 --- 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', } /** diff --git a/src/scripts/Providers/OSUI/Dropdown/VirtualSelect/scss/_virtualselect_lib.scss b/src/scripts/Providers/OSUI/Dropdown/VirtualSelect/scss/_virtualselect_lib.scss index b9c911011b..697a4329b9 100644 --- a/src/scripts/Providers/OSUI/Dropdown/VirtualSelect/scss/_virtualselect_lib.scss +++ b/src/scripts/Providers/OSUI/Dropdown/VirtualSelect/scss/_virtualselect_lib.scss @@ -1,5 +1,5 @@ /*! - * 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) */ @@ -401,7 +401,10 @@ } .vscomp-wrapper.focused .vscomp-toggle-button, .vscomp-wrapper:focus .vscomp-toggle-button { - box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.12), 0 1px 5px 0 rgba(0, 0, 0, 0.2); + box-shadow: + 0 2px 2px 0 rgba(0, 0, 0, 0.14), + 0 3px 1px -2px rgba(0, 0, 0, 0.12), + 0 1px 5px 0 rgba(0, 0, 0, 0.2); } .vscomp-wrapper.closed .vscomp-dropbox-container, .vscomp-wrapper.closed.vscomp-dropbox-wrapper { @@ -454,7 +457,10 @@ .vscomp-wrapper.keep-always-open.focused, .vscomp-wrapper.keep-always-open:focus, .vscomp-wrapper.keep-always-open:hover { - box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.12), 0 1px 5px 0 rgba(0, 0, 0, 0.2); + box-shadow: + 0 2px 2px 0 rgba(0, 0, 0, 0.14), + 0 3px 1px -2px rgba(0, 0, 0, 0.12), + 0 1px 5px 0 rgba(0, 0, 0, 0.2); } .vscomp-wrapper.server-searching .vscomp-options-list { display: none; @@ -613,7 +619,10 @@ opacity: 0; color: #000; background-color: #fff; - box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.12), 0 1px 5px 0 rgba(0, 0, 0, 0.2); + box-shadow: + 0 2px 2px 0 rgba(0, 0, 0, 0.14), + 0 3px 1px -2px rgba(0, 0, 0, 0.12), + 0 1px 5px 0 rgba(0, 0, 0, 0.2); text-align: left; flex-wrap: wrap; z-index: 1; @@ -634,7 +643,10 @@ width: 16px; height: 16px; background-color: #fff; - box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.12), 0 1px 5px 0 rgba(0, 0, 0, 0.2); + box-shadow: + 0 2px 2px 0 rgba(0, 0, 0, 0.14), + 0 3px 1px -2px rgba(0, 0, 0, 0.12), + 0 1px 5px 0 rgba(0, 0, 0, 0.2); -webkit-transform-origin: left top; transform-origin: left top; -webkit-transform: rotate(45deg);