Merge pull request #1242 from scheduleonce/staging-app2

Merging staging-app2 in to master.
scheduleonce · Jul 26, 2024 · 70e94e3 · 70e94e3
2 parents 4a1db43 + b31a4a2
commit 70e94e3
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [8.0.25] - 2024-07-08
+
+- [ONCEHUB-82598](https://scheduleonce.atlassian.net/browse/ONCEHUB-82598) fix: Occasionally, when hovering over elements that contain ouiToolTips, an unusual box appears.
+
+## [8.0.24] - 2024-07-10
+
+- [ONCEHUB-83691](https://scheduleonce.atlassian.net/browse/ONCEHUB-83691) update: change the color of help icon.
+
+## [8.0.23] - 2024-07-08
+
+- [ONCEHUB-83691](https://scheduleonce.atlassian.net/browse/ONCEHUB-83691) update: package update for additional information icon in the same place across the platform.
+
 ## [8.0.22] - 2024-06-28
 
 - [ONCEHUB-83609](https://scheduleonce.atlassian.net/browse/ONCEHUB-83609) update: package update for ws, socket.io and puppeteer

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oncehub-ui",
-  "version": "8.0.22",
+  "version": "8.0.26",
   "scripts": {
     "ng": "ng",
     "build": "ng build ui",

diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oncehub/ui",
-  "version": "8.0.22",
+  "version": "8.0.26",
   "description": "Oncehub UI",
   "peerDependencies": {},
   "repository": {

diff --git a/ui/src/components/dialog/dialog-content.ts b/ui/src/components/dialog/dialog-content.ts
@@ -87,7 +87,7 @@ export class OuiDialogHeaderAction {
 @Component({
   // eslint-disable-next-line @angular-eslint/component-selector
   selector: '[oui-dialog-header-article], [ouiDialogHeaderArticle]',
-  template: '<oui-icon svgIcon="article-icon"></oui-icon>',
+  template: '<oui-icon svgIcon="help-library"></oui-icon>',
   exportAs: 'ouiDialogHeaderArticle',
   // eslint-disable-next-line @angular-eslint/no-host-metadata-property
   host: {
@@ -103,9 +103,10 @@ export class OuiDialogHeaderArticle implements OnDestroy {
     private _focusMonitor: FocusMonitor,
     private _ngZone: NgZone
   ) {
-    this.ouiIconRegistry.addSvgIconLiteral(
-      `article-icon`,
-      this.domSanitizer.bypassSecurityTrustHtml(ICONS.ARTICLE_ICON)
+    this.ouiIconRegistry.addSvgIconSet(
+      this.domSanitizer.bypassSecurityTrustResourceUrl(
+        'https://cdn.icomoon.io/135790/oncehub-20/symbol-defs.svg?5df5gz'
+      )
     );
     this._monitorSubscription = this._focusMonitor
       .monitor(this.elementRef, true)

diff --git a/ui/src/components/dialog/dialog.scss b/ui/src/components/dialog/dialog.scss
@@ -132,13 +132,14 @@ $header-icon-height: 24px;
   .oui-icon {
     width: 16px;
     height: 20px;
-    padding-top: 3px;
     svg {
       vertical-align: top;
+      fill: #4a4a4a;
     }
   }
   &[class^='cdk'],
-  &[class$='focused'] {
+  &[class$='focused'],
+  &:hover {
     background: $icon-focus-background;
     border-radius: 2px;
     transition: $icon-focus-transition;

diff --git a/ui/src/components/tabs/tab-nav-bar/tab-link.scss b/ui/src/components/tabs/tab-nav-bar/tab-link.scss
@@ -39,6 +39,17 @@
       border: 1px solid #006bb1 !important;
       border-bottom: 0 !important;
     }
+    &.active {
+      .mdc-tab__content .mdc-tab__text-label {
+        color: #333;
+      }
+    }
+    &:first-child {
+      margin-left: 0;
+    }
+    &:last-child {
+      margin-right: 0;
+    }
   }
   .mdc-tab-indicator {
     display: flex;
@@ -71,7 +82,7 @@
       font-size: 16px;
       line-height: 22px;
       font-weight: 600;
-      color: #333;
+      color: #666;
       display: inline-flex;
       align-items: center;
     }

diff --git a/ui/src/components/tooltip/tooltip.ts b/ui/src/components/tooltip/tooltip.ts
@@ -479,6 +479,11 @@ export class OuiTooltip implements OnDestroy, CanDisable {
   hide(): void {
     if (this._tooltipInstance) {
       this._tooltipInstance.hide();
+    } else {
+      if (this._overlayRef) {
+        this._overlayRef.dispose();
+        this._overlayRef = null;
+      }
     }
   }
 
@@ -559,7 +564,8 @@ export class OuiTooltip implements OnDestroy, CanDisable {
   /** Detaches the currently-attached tooltip. */
   private _detach() {
     if (this._overlayRef && this._overlayRef.hasAttached()) {
-      this._overlayRef.detach();
+      this._overlayRef.dispose();
+      this._overlayRef = null;
     }
 
     this._tooltipInstance = null;

diff --git a/ui/src/stories/icon/icon.component.ts b/ui/src/stories/icon/icon.component.ts
@@ -30,7 +30,7 @@ export class OuiiconStorybook {
 
     this.ouiIconRegistry.addSvgIconSet(
       this.domSanitizer.bypassSecurityTrustResourceUrl(
-        'https://cdn.icomoon.io/135790/oncehub-20/symbol-defs.svg?81ot1f'
+        'https://cdn.icomoon.io/135790/oncehub-20/symbol-defs.svg?5df5gz'
       )
     );
   }