@chat21/chat21-web-widget 5.1.32-rc8 → 5.1.33-rc11

package/src/app/component/message/bubble-message/bubble-message.component.ts

@@ -1,149 +1,191 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, HostBinding, Input, OnDestroy, OnInit, Output } from '@angular/core';
+import { Observable, Subscription } from 'rxjs';
+import { map, startWith } from 'rxjs/operators';
 import { DomSanitizer } from '@angular/platform-browser';
 import { MessageModel } from 'src/chat21-core/models/message';
-import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
-import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
-import { MAX_WIDTH_IMAGES, MESSAGE_TYPE_MINE, MESSAGE_TYPE_OTHERS, MIN_WIDTH_IMAGES } from 'src/chat21-core/utils/constants';
+import { MESSAGE_TYPE_MINE, MESSAGE_TYPE_OTHERS, TYPE_MSG_URL_PREVIEW } from 'src/chat21-core/utils/constants';
 import { convertColorToRGBA } from 'src/chat21-core/utils/utils';
-import { isAudio, isAudioTTS, isFile, isFrame, isImage, messageType } from 'src/chat21-core/utils/utils-message';
+import { JsonSourcesParserService } from 'src/app/providers/json-sources-parser.service';
+import { calcImageSize, isAudio, isAudioTTS, isFile, isFrame, isImage, isJsonSources, messageType } from 'src/chat21-core/utils/utils-message';
 import { getColorBck } from 'src/chat21-core/utils/utils-user';
+import { VoiceService } from 'src/app/providers/voice/voice.service';
+import { JsonSourceItem } from '../json-sources/json-sources.component';
+import { VoiceTtsKaraokeWord } from 'src/app/providers/voice/voice-streaming.types';
 
 @Component({
   selector: 'chat-bubble-message',
   templateUrl: './bubble-message.component.html',
   styleUrls: ['./bubble-message.component.scss']
 })
-export class BubbleMessageComponent implements OnInit {
+export class BubbleMessageComponent implements OnInit, OnDestroy {
 
   @Input() message: MessageModel;
   @Input() isSameSender: boolean;
   @Input() fontColor: string;
   @Input() stylesMap: Map<string, string>;
+  @Input() translationMap: Map<string, string>;
+  /** When true, a newly-arrived bot text message reveals its words one by one. */
+  @Input() streamOnArrival = false;
+  /** One-shot flag: set once in ngOnChanges, never reverts so animation isn't replayed. */
+  _isStreaming = false;
+  /** Precomputed word list; rebuilt only when the message text changes. */
+  _streamingWords: Array<{ word: string; index: number }> = [];
+  /** Live karaoke word states driven by voiceTtsKaraoke$ during an active WSS session. */
+  _wssKaraokeWords$?: Observable<VoiceTtsKaraokeWord[]>;
+
+  private _kSub?: Subscription;
   @Output() onBeforeMessageRender = new EventEmitter();
   @Output() onAfterMessageRender = new EventEmitter();
-  @Output() onElementRendered = new EventEmitter<{element: string, status: boolean}>();
-  isImage = isImage;
-  isFile = isFile;
-  isFrame = isFrame;
-  isAudio = isAudio;
-  isAudioTTS=isAudioTTS;
-  convertColorToRGBA = convertColorToRGBA
-
- // ========== begin:: check message type functions ======= //
-  messageType = messageType;
-
-  MESSAGE_TYPE_MINE = MESSAGE_TYPE_MINE;
-  MESSAGE_TYPE_OTHERS = MESSAGE_TYPE_OTHERS;
- // ========== end:: check message type functions ======= //
-  sizeImage : { width: number, height: number}
-  fullnameColor: string;
-  private logger: LoggerService = LoggerInstance.getInstance()
-  constructor(public sanitizer: DomSanitizer) { }
-
-  ngOnInit() {
-    // console.log("---- > MSG:", this.message);
+  @Output() onElementRendered = new EventEmitter<{ element: string; status: boolean }>();
+
+  @HostBinding('class.no-background') get hostNoBackground() { return this.jsonSources !== null && this.jsonSources.length > 0; }
+  @HostBinding('class.json-resources') get hostIsJsonResources() { return this.jsonSources !== null && this.jsonSources.length > 0; }
+  @HostBinding('class.hidden-bubble') get hostHiddenBubble() { return !this.hasRenderableContent(); }
+
+  hasRenderableContent(): boolean {
+    const msg = this.message;
+    if (!msg) return false;
+    if (isImage(msg) || isFile(msg) || isFrame(msg) || isAudio(msg)) return true;
+    if (this.jsonSources && this.jsonSources.length > 0) return true;
+    // For url_preview messages, `text` may carry the raw JSON payload (not display text):
+    // if sources parsing yielded nothing, the bubble must stay hidden.
+    if (this.isUrlPreviewMessage) return false;
+    return !!(msg.text && String(msg.text).trim().length > 0);
   }
 
-  ngOnChanges() {
-    if (this.message && this.message.metadata && typeof this.message.metadata === 'object' ) {
-      this.sizeImage = this.getMetadataSize(this.message.metadata)
-    }
+  readonly isImage = isImage;
+  readonly isFile = isFile;
+  readonly isFrame = isFrame;
+  readonly isAudio = isAudio;
+  readonly isJsonSources = isJsonSources;
+  readonly isAudioTTS = isAudioTTS;
+  readonly messageType = messageType;
+  readonly convertColorToRGBA = convertColorToRGBA;
+  readonly MESSAGE_TYPE_MINE = MESSAGE_TYPE_MINE;
+  readonly MESSAGE_TYPE_OTHERS = MESSAGE_TYPE_OTHERS;
+
+  sizeImage: { width: number; height: number } = { width: 0, height: 0 };
+  fullnameColor: string = '';
+  jsonSources: JsonSourceItem[] | null = null;
+  isUrlPreviewMessage = false;
+
+  private urlPreviewReqId = 0;
+
+  constructor(
+    public sanitizer: DomSanitizer, 
+    public voiceService: VoiceService, 
+    private jsonSourcesParser: JsonSourcesParserService
+  ) { }
 
-    if(this.fontColor){
-      this.fullnameColor = convertColorToRGBA(this.fontColor, 65)
+  ngOnInit() {
+    // If this TTS message arrived while the voice proxy was active, mark it so
+    // audio-sync never replays it after the session ends.
+    if (isAudioTTS(this.message) && this.voiceService.isWssVoiceActive && this.message?.uid) {
+      this.voiceService.markProxyHandled(this.message.uid);
     }
-    if(this.message && this.message.sender_fullname && this.message.sender_fullname.trim() !== ''){
-      this.fullnameColor = getColorBck(this.message.sender_fullname)
+
+    // Set up karaoke observable for TTS messages during WSS sessions.
+    if (isAudioTTS(this.message) && this.message?.text) {
+      const text = this.message.text;
+      const rawWords = text.trim().split(/\s+/).filter((w) => w.length > 0);
+      // Always start as 'past' (fully visible). The karaoke RAF loop will drive
+      // words through future→active→past for the current speaking turn; using
+      // 'future' here would dimm old/history messages the moment voice opens.
+      const initialWords: VoiceTtsKaraokeWord[] = rawWords.map((w) => ({ text: w, state: 'past' as const }));
+
+      this._wssKaraokeWords$ = this.voiceService.voiceTtsKaraoke$.pipe(
+        startWith({ text, words: initialWords, activeIndex: -1 }),
+        map((frame) =>
+          frame.text === text
+            ? (frame.words as VoiceTtsKaraokeWord[])
+            : initialWords,
+        ),
+      );
     }
+  }
 
+  ngOnDestroy(): void {
+    this._kSub?.unsubscribe();
+    this._kSub = undefined;
   }
 
-  /**
-   *
-   * @param message
-   */
-  // getMetadataSize(metadata): any {
-  //   if(metadata.width === undefined){
-  //     metadata.width= MAX_WIDTH_IMAGES
-  //   }
-  //   if(metadata.height === undefined){
-  //     metadata.height = MAX_WIDTH_IMAGES
-  //   }
-  //   // const MAX_WIDTH_IMAGES = 300;
-  //   const sizeImage = {
-  //       width: metadata.width,
-  //       height: metadata.height
-  //   };
-  //   //   that.g.wdLog(['message::: ', metadata);
-  //   if (metadata.width && metadata.width > MAX_WIDTH_IMAGES) {
-  //       const rapporto = (metadata['width'] / metadata['height']);
-  //       sizeImage.width = MAX_WIDTH_IMAGES;
-  //       sizeImage.height = MAX_WIDTH_IMAGES / rapporto;
-  //   }
-  //   return sizeImage; // h.toString();
-  // }
-
-  /**
-   *
-   * @param message
-   */
-  getMetadataSize(metadata): {width, height} {
-    // if (metadata.width === undefined) {
-    //   metadata.width = MAX_WIDTH_IMAGES
-    // }
-    // if (metadata.height === undefined) {
-    //   metadata.height = MAX_WIDTH_IMAGES
-    // }
-
-    const sizeImage = {
-      width: metadata.width,
-      height: metadata.height
-    };
-
-
-    if (metadata.width && metadata.width < MAX_WIDTH_IMAGES) {
-      if (metadata.width <= 55) {
-        const ratio = (metadata['width'] / metadata['height']);
-        sizeImage.width = MIN_WIDTH_IMAGES;
-        sizeImage.height = MIN_WIDTH_IMAGES / ratio;
-      } else if (metadata.width > 55) {
-        sizeImage.width = metadata.width;
-        sizeImage.height = metadata.height
-      }
-    } else if (metadata.width && metadata.width > MAX_WIDTH_IMAGES) {
-      const ratio = (metadata['width'] / metadata['height']);
-      sizeImage.width = MAX_WIDTH_IMAGES;
-      sizeImage.height = MAX_WIDTH_IMAGES / ratio;
+  ngOnChanges(): void {
+    if (this.message?.metadata && typeof this.message.metadata === 'object') {
+      this.sizeImage = calcImageSize(this.message.metadata);
     }
-    return sizeImage
-  }
 
-  // ========= begin:: event emitter function ============//
+    this.fullnameColor = this.fontColor
+      ? convertColorToRGBA(this.fontColor, 65)
+      : this.fullnameColor;
+
+    if (this.message?.sender_fullname?.trim()) {
+      this.fullnameColor = getColorBck(this.message.sender_fullname);
+    }
+
+    // One-shot: activate word streaming for newly-arrived bot text messages during a voice session.
+    // Reset isJustRecived so the animation never replays on subsequent change detection cycles.
+    if (
+      !this._isStreaming &&
+      this.streamOnArrival &&
+      this.message?.isJustRecived === true &&
+      this.messageType(this.MESSAGE_TYPE_OTHERS, this.message) &&
+      !this.isAudio(this.message) &&
+      !this.isAudioTTS(this.message) &&
+      this.message?.type !== 'html'
+    ) {
+      this._isStreaming = true;
+      this._streamingWords = (this.message.text ?? '')
+        .trim()
+        .split(/\s+/)
+        .filter(w => w.length > 0)
+        .map((word, index) => ({ word, index }));
+      this.message.isJustRecived = false;
+    }
 
-  // returnOpenAttachment(event: String) {
-  //   this.onOpenAttachment.emit(event)
-  // }
+    if (this.message?.type !== TYPE_MSG_URL_PREVIEW) {
+      this.jsonSources = null;
+      return;
+    }
 
-  // /** */
-  // returnClickOnAttachmentButton(event: any) {
-  //   this.onClickAttachmentButton.emit(event)
-  // }
+    // url_preview payload can live on message root OR inside metadata/attributes depending on the integration.
+    const urlPreviewLike =
+      this.message?.type === TYPE_MSG_URL_PREVIEW
+      || this.message?.metadata?.type === TYPE_MSG_URL_PREVIEW
+      || this.message?.attributes?.type === TYPE_MSG_URL_PREVIEW;
+    this.isUrlPreviewMessage = !!urlPreviewLike;
+    if (urlPreviewLike) this.loadJsonSourcesFromUrlPreviewMessage();
+  }
 
-  onBeforeMessageRenderFN(event){
-    const messageOBJ = { message: this.message, sanitizer: this.sanitizer, messageEl: event.messageEl, component: event.component}
-    this.onBeforeMessageRender.emit(messageOBJ)
+  private async loadJsonSourcesFromUrlPreviewMessage(): Promise<void> {
+    // Protect the UI from out-of-order async responses when the input `message` changes quickly.
+    const reqId = ++this.urlPreviewReqId;
+    // 1) Parse-only, so the UI can render immediately (no url-preview calls).
+    const baseSources = this.jsonSourcesParser.parseBaseFromMessage(this.message);
+    this.jsonSources = baseSources;
+
+    // 2) Enrich in background via url-preview, then merge missing fields.
+    const enriched = await this.jsonSourcesParser.enrichSources(baseSources);
+    if (reqId !== this.urlPreviewReqId) return;
+    this.jsonSources = enriched;
   }
 
-  onAfterMessageRenderFN(event){
-    const messageOBJ = { message: this.message, sanitizer: this.sanitizer, messageEl: event.messageEl, component: event.component}
-    this.onAfterMessageRender.emit(messageOBJ)
+  trackWord(_index: number, item: { word: string; index: number }): number {
+    return item.index;
   }
 
-  onElementRenderedFN(event){
-    this.onElementRendered.emit({element: event.element, status: event.status})
+  trackKaraokeWord(index: number): number {
+    return index;
   }
 
-  // ========= END:: event emitter function ============//
+  onBeforeMessageRenderFN(event: any): void {
+    this.onBeforeMessageRender.emit({ message: this.message, sanitizer: this.sanitizer, messageEl: event.messageEl, component: event.component });
+  }
 
+  onAfterMessageRenderFN(event: any): void {
+    this.onAfterMessageRender.emit({ message: this.message, sanitizer: this.sanitizer, messageEl: event.messageEl, component: event.component });
+  }
 
+  onElementRenderedFN(event: any): void {
+    this.onElementRendered.emit({ element: event.element, status: event.status });
+  }
 }

package/src/app/component/message/buttons/action-button/action-button.component.html

@@ -1,8 +1,7 @@
-<div #actionButton id="actionButton" class="button-in-msg action" 
+<div #actionButton class="button-in-msg action action-button"
   [ngClass]="{'disabled': isConversationArchived}"
-  (click)="actionButtonAction()" 
-  (mouseover)="onMouseOver($event)" 
+  (click)="actionButtonAction()"
+  (mouseover)="onMouseOver($event)"
   (mouseout)="onMouseOut($event)">
     {{button?.value}}
 </div>
-<!-- title="{{button?.value}}" -->

package/src/app/component/message/buttons/action-button/action-button.component.spec.ts

@@ -1,4 +1,6 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { SimpleChange } from '@angular/core';
+import { ComponentFixture, TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 
 import { ActionButtonComponent } from './action-button.component';
 
@@ -6,20 +8,62 @@ describe('ActionButtonComponent', () => {
   let component: ActionButtonComponent;
   let fixture: ComponentFixture<ActionButtonComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [ ActionButtonComponent ]
-    })
-    .compileComponents();
+      declarations: [ActionButtonComponent],
+    }).compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ActionButtonComponent);
     component = fixture.componentInstance;
+    component.button = { value: 'OK', action: 'go' };
     fixture.detectChanges();
   });
 
   it('should create', () => {
     expect(component).toBeTruthy();
   });
+
+  it('ngOnChanges should map theme CSS variables onto .action', () => {
+    component.fontSize = '16px';
+    component.backgroundColor = '#111';
+    component.textColor = '#222';
+    component.hoverBackgroundColor = '#333';
+    component.hoverTextColor = '#444';
+    component.ngOnChanges({
+      fontSize: new SimpleChange(null, '16px', true),
+    });
+    const el = fixture.nativeElement.querySelector('.action') as HTMLElement;
+    expect(el.style.getPropertyValue('--buttonFontSize').trim()).toBe('16px');
+    expect(el.style.getPropertyValue('--buttonBackgroundColor').trim()).toBeTruthy();
+  });
+
+  it('actionButtonAction should emit when action present', fakeAsync(() => {
+    spyOn(component.onButtonClicked, 'emit');
+    const de = fixture.debugElement.query(By.css('.action'));
+    de.triggerEventHandler('click', {});
+    tick(500);
+    expect(component.onButtonClicked.emit).toHaveBeenCalled();
+  }));
+
+  it('actionButtonAction should no-op when button has no action', () => {
+    component.button = { value: 'X', action: '' };
+    fixture.detectChanges();
+    spyOn(component.onButtonClicked, 'emit');
+    component.actionButtonAction();
+    expect(component.onButtonClicked.emit).not.toHaveBeenCalled();
+  });
+
+  it('mouseover and mouseout should not throw', () => {
+    expect(() => component.onMouseOver({} as any)).not.toThrow();
+    expect(() => component.onMouseOut({} as any)).not.toThrow();
+  });
+
+  it('template should mark archived conversations as disabled', () => {
+    component.isConversationArchived = true;
+    fixture.detectChanges();
+    const el = fixture.nativeElement.querySelector('.action');
+    expect(el.classList.contains('disabled')).toBe(true);
+  });
 });

package/src/app/component/message/buttons/link-button/link-button.component.scss

@@ -42,20 +42,17 @@
     transition: background-color .6s ease;
     .icon-button-action {
         position: absolute;
-        top: 50%;
-        right: 8px;
-        transform: translateY(-50%);
+        top: -1px;
+        right: 1px;
         svg {
-            fill: var(--textColor);
+            fill: var(--buttonTextColor);
         }
     }
     .icon-button-action-self{
         position: absolute;
-        top: 50%;
-        right: 8px;
-        transform: translateY(-50%);
+        right: 1px;
         svg {
-            fill: var(--textColor);
+            fill: var(--buttonTextColor);
         }
     }
     &:focus,

package/src/app/component/message/buttons/link-button/link-button.component.spec.ts

@@ -1,4 +1,6 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { SimpleChange } from '@angular/core';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 
 import { LinkButtonComponent } from './link-button.component';
 
@@ -6,20 +8,63 @@ describe('LinkButtonComponent', () => {
   let component: LinkButtonComponent;
   let fixture: ComponentFixture<LinkButtonComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [ LinkButtonComponent ]
-    })
-    .compileComponents();
+      declarations: [LinkButtonComponent],
+    }).compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(LinkButtonComponent);
     component = fixture.componentInstance;
+    component.button = { value: 'Open', link: 'https://x.test', target: 'blank' };
     fixture.detectChanges();
   });
 
   it('should create', () => {
     expect(component).toBeTruthy();
   });
+
+  it('ngOnChanges should set CSS variables on .url', () => {
+    component.fontSize = '12px';
+    component.backgroundColor = '#aaa';
+    component.textColor = '#bbb';
+    component.hoverBackgroundColor = '#ccc';
+    component.hoverTextColor = '#ddd';
+    component.ngOnChanges({
+      fontSize: new SimpleChange(null, '12px', true),
+    });
+    const el = fixture.nativeElement.querySelector('.url') as HTMLElement;
+    expect(el.style.getPropertyValue('--buttonFontSize').trim()).toBe('12px');
+  });
+
+  it('actionButtonUrl should emit when link set', () => {
+    spyOn(component.onButtonClicked, 'emit');
+    component.actionButtonUrl();
+    expect(component.onButtonClicked.emit).toHaveBeenCalled();
+  });
+
+  it('actionButtonUrl should not emit when link empty', () => {
+    component.button = { value: 'x', link: '' };
+    spyOn(component.onButtonClicked, 'emit');
+    component.actionButtonUrl();
+    expect(component.onButtonClicked.emit).not.toHaveBeenCalled();
+  });
+
+  it('should render external icon when target is not self', () => {
+    component.button = { value: 'L', link: 'u', target: 'blank' };
+    fixture.detectChanges();
+    expect(fixture.debugElement.query(By.css('.icon-button-action'))).toBeTruthy();
+  });
+
+  it('should render self icon when target is self', () => {
+    component.button = { value: 'L', link: 'u', target: 'self' };
+    fixture.detectChanges();
+    expect(fixture.debugElement.query(By.css('.icon-button-action-self'))).toBeTruthy();
+  });
+
+  it('mouseover and mouseout should not throw', () => {
+    expect(() => component.onMouseOver({} as any)).not.toThrow();
+    expect(() => component.onMouseOut({} as any)).not.toThrow();
+  });
 });

package/src/app/component/message/buttons/text-button/text-button.component.spec.ts

@@ -1,4 +1,6 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { SimpleChange } from '@angular/core';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 
 import { TextButtonComponent } from './text-button.component';
 
@@ -6,20 +8,57 @@ describe('TextButtonComponent', () => {
   let component: TextButtonComponent;
   let fixture: ComponentFixture<TextButtonComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [ TextButtonComponent ]
-    })
-    .compileComponents();
+      declarations: [TextButtonComponent],
+    }).compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(TextButtonComponent);
     component = fixture.componentInstance;
+    component.button = { value: 'Reply' };
+    component.isConversationArchived = false;
     fixture.detectChanges();
   });
 
   it('should create', () => {
     expect(component).toBeTruthy();
   });
+
+  it('ngOnChanges should set CSS variables on .text', () => {
+    component.fontSize = '13px';
+    component.backgroundColor = '#111';
+    component.textColor = '#222';
+    component.hoverBackgroundColor = '#333';
+    component.hoverTextColor = '#444';
+    component.ngOnChanges({
+      fontSize: new SimpleChange(null, '13px', true),
+    });
+    const el = fixture.nativeElement.querySelector('.text') as HTMLElement;
+    expect(el.style.getPropertyValue('--buttonFontSize').trim()).toBe('13px');
+  });
+
+  it('actionButtonText should emit click payload', () => {
+    spyOn(component.onButtonClicked, 'emit');
+    component.actionButtonText();
+    expect(component.onButtonClicked.emit).toHaveBeenCalled();
+  });
+
+  it('click on template should invoke actionButtonText', () => {
+    spyOn(component, 'actionButtonText');
+    fixture.debugElement.query(By.css('.text')).triggerEventHandler('click', {});
+    expect(component.actionButtonText).toHaveBeenCalled();
+  });
+
+  it('should add disabled class when conversation archived', () => {
+    component.isConversationArchived = true;
+    fixture.detectChanges();
+    expect(fixture.nativeElement.querySelector('.text').classList.contains('disabled')).toBe(true);
+  });
+
+  it('mouseover and mouseout should not throw', () => {
+    expect(() => component.onMouseOver({} as any)).not.toThrow();
+    expect(() => component.onMouseOut({} as any)).not.toThrow();
+  });
 });

package/src/app/component/message/carousel/carousel.component.html

@@ -1,19 +1,28 @@
-<div class="wrapper">
-    <div id="left" class="arrow left" (click)="goTo('previous')" *ngIf="activeElement > 1">
-        <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000">
+<div class="wrapper"
+    role="region"
+    aria-roledescription="carousel"
+    [attr.aria-label]="translationMap?.get('CAROUSEL_LABEL') || 'Cards carousel'">
+    <button type="button"
+        id="left"
+        class="arrow left c21-button-clean"
+        [attr.aria-label]="translationMap?.get('CAROUSEL_PREVIOUS') || 'Previous slide'"
+        (click)="goTo('previous')" *ngIf="activeElement > 1">
+        <svg aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000">
             <path d="M0 0h24v24H0V0z" fill="none"/><path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12l4.58-4.59z"/>
         </svg>
-    </div>
+    </button>
     <div class="carousel">
-        <!-- <div class="card" style="width: 17px;"></div> -->
-        <div class="card" *ngFor="let card of gallery; let i = index">
-            <!-- <div [style.opacity]="i+1 === activeElement? 1: 0.5"> -->
+        <div class="card"
+            *ngFor="let card of gallery; let i = index"
+            role="group"
+            aria-roledescription="slide"
+            [attr.aria-label]="getSlideLabel(i + 1, gallery?.length)">
             <div>
                 <div class="card-image" *ngIf="card?.preview?.src !== ''">
-                    <img [src]="card?.preview?.src" alt="img" draggable="false">
+                    <img [src]="card?.preview?.src" [attr.alt]="card?.title || 'Carousel image'" draggable="false">
                 </div>
                 <div class="card-image card-image-placeholder" *ngIf="card?.preview?.src == ''">
-                    <img src="assets/images/icons/no-image.svg" alt="img" draggable="false">
+                    <img src="assets/images/icons/no-image.svg" alt="" draggable="false">
                     <span>Image not available</span>
                 </div>
                 <div class="card-content">
@@ -21,20 +30,24 @@
                     <div class="card-description">{{card?.description}}</div>
                 </div>
                 <div class="buttons" *ngIf="card?.buttons && card?.buttons.length > 0">
-                    <div *ngFor="let button of card?.buttons" 
-                        class="single-button action"
+                    <button type="button" *ngFor="let button of card?.buttons"
+                        class="single-button action c21-button-clean"
                         [ngClass]="{'disabled': (isConversationArchived || (!isLastMessage && button.type !== TYPE_BUTTON.URL)), 'active': button?.active}"
+                        [attr.aria-label]="button?.value"
                         (click)="actionButtonClick($event, button, i)" >
                         {{button.value}}
-                    </div>
+                    </button>
                 </div>
             </div>
         </div>
-        <!-- <div class="card" style="width: 17px;"></div> -->
     </div>
-    <div id="right" class="arrow right" (click)="goTo('next')" *ngIf="activeElement !== gallery.length">
-        <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000">
+    <button type="button"
+        id="right"
+        class="arrow right c21-button-clean"
+        [attr.aria-label]="translationMap?.get('CAROUSEL_NEXT') || 'Next slide'"
+        (click)="goTo('next')" *ngIf="activeElement !== gallery.length">
+        <svg aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000">
             <path d="M0 0h24v24H0V0z" fill="none"/><path d="M10.02 6L8.61 7.41 13.19 12l-4.58 4.59L10.02 18l6-6-6-6z"/>
         </svg>
-    </div>
+    </button>
 </div>