Merge branch 'dev' into ROU-4503

OutSystems · Aug 29, 2023 · 5399cc1 · 5399cc1
2 parents 0906099 + 18173d2
commit 5399cc1
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 29 deletions.
diff --git a/dist/OutSystemsUI.css b/dist/OutSystemsUI.css
@@ -11706,6 +11706,9 @@ html[data-uieditorversion^="1"] .osui-timepicker__dropdown-ss-preview.time12h, h
   -webkit-perspective:1000px;
           perspective:1000px;
 }
+.desktop .osui-tabs__content-item:not(.osui-tabs--is-active) *{
+  visibility:hidden;
+}
 .osui-tabs__preview{
   display:none;
 }

diff --git a/src/scripts/OSFramework/OSUI/Pattern/Tabs/scss/_tabs.scss b/src/scripts/OSFramework/OSUI/Pattern/Tabs/scss/_tabs.scss
@@ -363,6 +363,13 @@
 	}
 }
 
+// Fix issue when patterns like Dropdown are open when the header click is triggered.
+.desktop {
+	.osui-tabs__content-item:not(.osui-tabs--is-active) * {
+		visibility: hidden;
+	} 
+}
+
 // Service Studio Preview Message
 .osui-tabs__preview {
 	display: none;

diff --git a/src/scripts/Providers/OSUI/Dropdown/VirtualSelect/AbstractVirtualSelect.ts b/src/scripts/Providers/OSUI/Dropdown/VirtualSelect/AbstractVirtualSelect.ts
@@ -42,29 +42,10 @@ namespace Providers.OSUI.Dropdown.VirtualSelect {
 
 		// Manage the attributes to be added
 		private _manageAttributes(): void {
-			// Check if the pattern should be in disabled mode
-			this._manageDisableStatus();
-
 			// Manage A11Y attributes
 			this.setA11YProperties();
 		}
 
-		// Manage the disable status of the pattern
-		private _manageDisableStatus(): void {
-			if (this.configs.IsDisabled) {
-				OSFramework.OSUI.Helper.Dom.Attribute.Set(
-					this.selfElement,
-					OSFramework.OSUI.GlobalEnum.HTMLAttributes.Disabled,
-					''
-				);
-			} else {
-				OSFramework.OSUI.Helper.Dom.Attribute.Remove(
-					this.selfElement,
-					OSFramework.OSUI.GlobalEnum.HTMLAttributes.Disabled
-				);
-			}
-		}
-
 		// Prevent the default behaviour of the event
 		private _onMouseUp(event) {
 			event.preventDefault();
@@ -275,8 +256,6 @@ namespace Providers.OSUI.Dropdown.VirtualSelect {
 			if (this.isBuilt) {
 				switch (propertyName) {
 					case OSFramework.OSUI.Patterns.Dropdown.Enum.Properties.IsDisabled:
-						this._manageDisableStatus();
-						break;
 					case Enum.Properties.NoOptionsText:
 					case Enum.Properties.NoResultsText:
 					case Enum.Properties.OptionsList:
@@ -319,10 +298,9 @@ namespace Providers.OSUI.Dropdown.VirtualSelect {
 		 * @memberof Providers.OSUI.Dropdown.VirtualSelect.AbstractVirtualSelect
 		 */
 		public disable(): void {
-			if (this.configs.IsDisabled === false) {
+			if (this.configs.IsDisabled === false && this.provider !== undefined) {
 				this.configs.IsDisabled = true;
-
-				this._manageDisableStatus();
+				this.provider.$ele.disable();
 			}
 		}
 
@@ -359,10 +337,9 @@ namespace Providers.OSUI.Dropdown.VirtualSelect {
 		 * @memberof Providers.OSUI.Dropdown.VirtualSelect.AbstractVirtualSelect
 		 */
 		public enable(): void {
-			if (this.configs.IsDisabled) {
+			if (this.configs.IsDisabled && this.provider !== undefined) {
 				this.configs.IsDisabled = false;
-
-				this._manageDisableStatus();
+				this.provider.$ele.enable();
 			}
 		}
 

diff --git a/src/scripts/Providers/OSUI/Dropdown/VirtualSelect/AbstractVirtualSelectConfig.ts b/src/scripts/Providers/OSUI/Dropdown/VirtualSelect/AbstractVirtualSelectConfig.ts
@@ -180,6 +180,7 @@ namespace Providers.OSUI.Dropdown.VirtualSelect {
 			// Set the library options
 			this._providerOptions = {
 				ele: this.ElementId,
+				disabled: this.IsDisabled,
 				dropboxWrapper: OSFramework.OSUI.GlobalEnum.HTMLElement.Body,
 				hasOptionDescription: hasDescription,
 				hideClearButton: false,

diff --git a/src/scripts/Providers/OSUI/Dropdown/VirtualSelect/README.md b/src/scripts/Providers/OSUI/Dropdown/VirtualSelect/README.md
@@ -1,3 +1,3 @@
-# VirtualSelect · ![virtualselect version](https://img.shields.io/badge/version-v1.0.39-informational)
+# VirtualSelect · ![virtualselect version](https://img.shields.io/badge/version-v1.0.40-informational)
 
 All info about this Provider <a href="https://sa-si-dev.github.io/virtual-select/#/">here</a>.
diff --git a/src/scripts/Providers/OSUI/Dropdown/VirtualSelect/scss/_virtualselect_lib.scss b/src/scripts/Providers/OSUI/Dropdown/VirtualSelect/scss/_virtualselect_lib.scss
@@ -243,7 +243,9 @@
 	position: relative;
 }
 .vscomp-search-label,
-.vscomp-live-region {
+.vscomp-live-region,
+.vscomp-dropbox-container-top,
+.vscomp-dropbox-container-bottom {
 	border: 0;
 	clip: rect(0 0 0 0);
 	height: 1px;