@chat21/chat21-ionic 3.0.78-rc.2 → 3.0.78-rc.4

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # chat21-ionic ver 3.0
 
+### 3.0.78-rc.4
+- bug-fixed: unassigned request not sound the if is the first at all
+- bug-fixed: translations missed
+- bug-fixed: direct info not showed in conversation-header component
+- removed: conversation-footer border top
+- changed: colors to message-text-area icons and message-attachment components
+
+### 3.0.78-rc.3
+- changed: user-typing location moved from conversation-header to conversation-detail component
+- changed: replace includes with startsWith for check what type of conversation is in project info conversation-list component
+- added: styleMap integrations to some elements	
+- bug-fixed: no tooltip showed if no unserved request are present
+
 ### 3.0.78-rc.2
 - changed: project item UI and tooltip msg
 - changed: conversation UI in conversations list component

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@chat21/chat21-ionic",
     "author": "Tiledesk SRL",
-    "version": "3.0.78-rc.2",
+    "version": "3.0.78-rc.4",
     "license": "MIT License",
     "homepage": "https://tiledesk.com/",
     "repository": {

package/src/app/app.component.scss

@@ -2,6 +2,7 @@
     min-width: 360px; //312px;
     display: block; // Safari bug fix
     margin-left: 60px;
+    --border: 0px;
 }
 
 .sidebar-visible {

package/src/app/app.component.ts

@@ -102,7 +102,6 @@ export class AppComponent implements OnInit {
   public missingConnectionToast: any
   public executedInitializeAppByWatchConnection: boolean = false;
   private isInitialized: boolean = false;
-  private hasToSoundUnservedRequestCount: boolean = false;
   private version: string;
   IS_ONLINE: boolean;
   IS_ON_MOBILE_DEVICE: boolean;
@@ -1125,7 +1124,6 @@ export class AppComponent implements OnInit {
     if (hasClickedLogout === true) {
       this.appStorageService.removeItem('conversations')
       this.isInitialized = false;
-      this.hasToSoundUnservedRequestCount = false;
       // ----------------------------------------------
       // PUSH NOTIFICATIONS
       // ----------------------------------------------
@@ -1150,12 +1148,9 @@ export class AppComponent implements OnInit {
 
   subscribeUnservedRequestCount = (unservedRequestCount) => {
     if(unservedRequestCount && unservedRequestCount > 0){
-      this.logger.debug("hasToSoundUnservedRequestCount::::", this.hasToSoundUnservedRequestCount, this.isInitialized)
-      if(this.hasToSoundUnservedRequestCount){
+      this.logger.debug("appIsInitialized::::",this.isInitialized)
+      if(this.isInitialized){
         this.manageTabNotification(unservedRequestCount) //sound and alternate title
-      } else {
-        //not sound the first time
-        this.hasToSoundUnservedRequestCount = true
       }
     }
   }

package/src/app/chatlib/conversation-detail/conversation-content/conversation-content.component.ts

@@ -17,11 +17,18 @@ export class ConversationContentComponent implements OnInit {
   @Input() messages: MessageModel[]
   @Input() senderId: string;
   @Input() baseLocation: string;
+  @Input() isConversationArchived: boolean;
+  @Input() isTypings: boolean;
+  @Input() idUserTypingNow: string;
+  @Input() nameUserTypingNow: string;
+  @Input() typingLocation: string;
+  @Input() fullscreenMode: boolean;
   @Input() translationMap: Map<string, string>;
   @Input() stylesMap: Map<string, string>;
   @Output() onBeforeMessageRender = new EventEmitter();
   @Output() onAfterMessageRender = new EventEmitter();
-  @Output() onMenuOptionShow = new EventEmitter();
+  @Output() onMenuOptionShow = new EventEmitter<boolean>();
+  @Output() onEmojiiPickerShow = new EventEmitter<boolean>()
   @Output() onAttachmentButtonClicked = new EventEmitter();
   @Output() onScrollContent = new EventEmitter();
 

package/src/app/chatlib/conversation-detail/ion-conversation-detail/ion-conversation-detail.component.html

@@ -92,9 +92,12 @@
       <chat-bubble-message class="messages msg_sent" id="message_msg_sent" style="position: relative;" 
         [ngClass]="{'has-metadata': (isImage(message) || isFrame(message)), 'privateMsg': (message?.attributes && message?.attributes?.subtype === 'private')}" 
         [class.emoticon]="isEmojii(message?.text)"
+        [ngStyle]="{'background': stylesMap.get('bubbleSentBackground'), 'color': stylesMap.get('bubbleSentTextColor')}"
         [ngClass]="{'button-in-msg' : message.metadata && message.metadata.button}"
         [message]="message" 
-        [textColor]="'col-msg-sent'"
+        [fontColor]="stylesMap.get('bubbleSentTextColor')"
+        [fontSize]="stylesMap.get('fontSize')"
+        [fontFamily]="stylesMap.get('fontFamily')"
         [addAsCannedResponseTooltipText]="addAsCannedResponseTooltipText" 
         [areVisibleCAR]="areVisibleCAR"
         [supportMode]="supportMode"
@@ -117,8 +120,6 @@
       class="message_sender_fullname">
       {{message.sender_fullname}}
     </div>
-
-
     <div role="messaggio" *ngIf="messageType(MESSAGE_TYPE_OTHERS, message)" class="msg_container base_receive">
 
       <!-- <chat-avatar-image class="slide-in-left"  
@@ -132,8 +133,11 @@
       <chat-bubble-message class="messages msg_receive" id="message_msg_receive" style="position: relative;"
         [ngClass]="{'has-metadata': (isImage(message) || isFrame(message)), 'privateMsg': (message?.attributes && message?.attributes?.subtype === 'private')}" 
         [class.emoticon]="isEmojii(message?.text)"
+        [ngStyle]="{'background': stylesMap?.get('bubbleReceivedBackground'), 'color': stylesMap.get('bubbleReceivedTextColor')}"
         [message]="message" 
-        [textColor]="'black'"
+        [fontColor]="stylesMap?.get('bubbleReceivedTextColor')"
+        [fontSize]="stylesMap?.get('fontSize')"
+        [fontFamily]="stylesMap?.get('fontFamily')"
         [addAsCannedResponseTooltipText]="addAsCannedResponseTooltipText" 
         [areVisibleCAR]="areVisibleCAR"
         [supportMode]="supportMode"
@@ -158,15 +162,26 @@
 
   <!-- uploadProgress -> {{ uploadProgress }} -->
   <div *ngIf="uploadProgress !== 100" class="msg_container base_sent" style="margin-right: 20px;">
-    <div class="messages msg_sent">
-      <div class="spinner">
-        <div class="bounce1"></div>
-        <div class="bounce2"></div>
-        <div class="bounce3"></div>
-      </div>
+    <div class="chat21-spinner active" id="chat21-spinner" style="margin: 0px 6px 0px;">
+      <div class="chat21-bounce1" [ngStyle]="{'background-color': stylesMap.get('themeColor')}"></div>
+      <div class="chat21-bounce2" [ngStyle]="{'background-color': stylesMap.get('themeColor'), 'opacity': 0.4}"></div>
+      <div class="chat21-bounce3" [ngStyle]="{'background-color': stylesMap.get('themeColor'), 'opacity': 0.6}"></div>
+      <!-- <span [ngStyle]="{'color': stylesMap.get('themeColor')}">{{translationMap.get('LABEL_LOADING')}}</span> -->
     </div>
   </div>
 
+  <div *ngIf="isTypings" class="msg_container base_receive typing_container">
+    <!-- !isSameSender(idUserTypingNow, i) -->
+    <!-- <div *ngIf="nameUserTypingNow">{{nameUserTypingNow}}</div> -->
+    <user-typing
+      [themeColor]="stylesMap?.get('themeColor')"
+      [translationMap]="translationMap"
+      [idUserTypingNow]="idUserTypingNow"
+      [nameUserTypingNow]="nameUserTypingNow">
+    </user-typing>
+    <div class="typing_info" *ngIf="nameUserTypingNow"> {{nameUserTypingNow}} {{translationMap.get('LABEL_IS_WRITING')}}</div>
+  </div>
+
 </div>
 
 <!-- fileType > {{fileType }} uploadProgress {{uploadProgress}} -->

package/src/app/chatlib/conversation-detail/ion-conversation-detail/ion-conversation-detail.component.scss

@@ -65,10 +65,11 @@
 
     ion-button {
         text-transform: unset;
+        color: var(--basic-blue);
         &:hover {
             --background-hover: transparent;
             text-decoration: underline;
-            text-decoration-color: var(--ion-color-primary);
+            text-decoration-color: var(--basic-blue);
         }
     }
 
@@ -105,12 +106,33 @@ ion-item {
 
 .message_sender_fullname {
     font-size: 0.9em;
-    margin: 0 0 1px 10px;
+    margin: 0 0 1px 20px;
     // color: var(--gray);
     font-weight: 500;
     color: #080f1a;
 }
 
+.typing_container{
+    display:flex;
+    align-items: center;
+
+    user-typing {
+        text-align: right;
+    }
+    .typing_info{  
+        color: var(--basic-gray);
+        margin-left: 10px;
+        font-size: 12px;
+        animation: blinker 1s linear infinite;
+
+        @keyframes blinker {
+            50% {
+              opacity: 0;
+            }
+          }
+    }
+}
+
 .messages {
     border-radius: 18px;
     padding: 0;
@@ -158,7 +180,7 @@ ion-item {
 /** recive message **/
 .base_receive {
     // padding: 0px 0px 6px 0px;
-    padding: 0px 0px 15px 0px; // edited to display the date at the bottom of the "message bubble"
+    padding: 0px 0px 15px 10px; // edited to display the date at the bottom of the "message bubble"
     /* avatar */
     .content-avatar {
         position: relative;
@@ -187,8 +209,8 @@ ion-item {
     }
     /* message */
     .msg_receive {
-        background-color: var(--light-white);
-        color: #1a1a1a;
+        background-color: var(--bck-msg-received);
+        color: var(--col-msg-received);
         // max-width: 260px;
         max-width: calc(100% - 70px);
         min-width: 14px;
@@ -212,63 +234,64 @@ ion-item {
     .has-metadata {
         max-width: 100% !important;
     }
+
 }
 
 .time {
     margin-bottom: 20px;
 }
 
-// Loading Spinner
-.spinner {
-    // margin: 100px auto 0;
-    width: 90px;
+ /* LOADING */
+/*http://tobiasahlin.com/spinkit/*/
+#chat21-spinner {
+    display: none;
+    width: 70px;
     min-height: 20px;
-    padding: 7px;
+    margin: 20px auto 0;
     text-align: center;
 }
-
-.spinner > div {
-    width: 10px;
-    height: 10px;
-    background-color: rgb(255, 255, 255);
-
+#chat21-spinner.active {
+    display: block;
+}
+#chat21-spinner > div {
+    width: 12px;
+    height: 12px;
+    background-color: var(--bubble-blue);
     border-radius: 100%;
     display: inline-block;
     -webkit-animation: sk-bouncedelay 1.4s infinite ease-in-out both;
     animation: sk-bouncedelay 1.4s infinite ease-in-out both;
 }
-
-.spinner .bounce1 {
+#chat21-spinner .chat21-bounce1 {
     -webkit-animation-delay: -0.32s;
     animation-delay: -0.32s;
 }
-
-.spinner .bounce2 {
+#chat21-spinner .chat21-bounce2 {
     -webkit-animation-delay: -0.16s;
     animation-delay: -0.16s;
 }
-
+#chat21-spinner span {
+    display: block;
+    margin: 0.5em 0 0 0;
+    color: var(--col-msg-sent);
+    /* text-transform: uppercase; */
+    font-family: 'Roboto', sans-serif;
+    -webkit-animation: pulse 2000ms linear infinite;
+    -moz-animation: pulse 2000ms linear infinite;
+    animation: pulse 2000ms linear infinite;
+    text-align: center;
+}
 @-webkit-keyframes sk-bouncedelay {
-    0%,
-    80%,
-    100% {
-        -webkit-transform: scale(0);
-    }
-    40% {
-        -webkit-transform: scale(1);
-    }
+    0%, 80%, 100% { -webkit-transform: scale(0) }
+    40% { -webkit-transform: scale(1.0) }
 }
-
 @keyframes sk-bouncedelay {
-    0%,
-    80%,
-    100% {
-        -webkit-transform: scale(0);
-        transform: scale(0);
-    }
-    40% {
-        -webkit-transform: scale(1);
-        transform: scale(1);
+    0%, 80%, 100% { 
+    -webkit-transform: scale(0);
+    transform: scale(0);
+    } 40% { 
+    -webkit-transform: scale(1.0);
+    transform: scale(1.0);
     }
 }
 

package/src/app/chatlib/conversation-detail/message/bubble-message/bubble-message.component.html

@@ -50,7 +50,7 @@
 
       <chat-text *ngIf="message?.type !=='html'"
         [text]="message?.text" 
-        [color]="textColor" 
+        [color]="fontColor" 
         [message]="message"
         (onBeforeMessageRender)="returnOnBeforeMessageRender($event)"
         (onAfterMessageRender)="returnOnAfterMessageRender($event)">

package/src/app/chatlib/conversation-detail/message/bubble-message/bubble-message.component.ts

@@ -18,7 +18,9 @@ import { ModalController } from '@ionic/angular';
 export class BubbleMessageComponent implements OnInit, OnChanges {
 
   @Input() message: MessageModel;
-  @Input() textColor: string;
+  @Input() fontColor: string;
+  @Input() fontSize: string;
+  @Input() fontFamily: string;
   @Input() areVisibleCAR: boolean;
   @Input() supportMode: boolean;
   @Output() onBeforeMessageRender = new EventEmitter();

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

@@ -1,3 +1,7 @@
-<div #actionButton id="actionButton" class="button-in-msg action" (click)="actionButtonAction()" title="{{button?.value}}">
+<div #actionButton id="actionButton" class="button-in-msg action" 
+title="{{button?.value}}"
+(click)="actionButtonAction()"
+(mouseover)="onMouseOver($event)" 
+(mouseout)="onMouseOut($event)">
   {{button.value}}
 </div>

package/src/app/chatlib/conversation-detail/message/buttons/action-button/action-button.component.scss

@@ -1,12 +1,11 @@
 // @import '../../../../../sass/variables';
 
 div {
-    --bck-msg-sent: #62a8ea;
-    --col-msg-sent:#ffffff;
-    --light-white: #f7f7f7;
-    --black: #1a1a1a;
-    --gray: #aaaaaa;
-    --blue: rgb(42, 106, 193);
+    --backgroundColor: --basic-blue;
+    --textColor: --bck-msg-sent;
+    --hoverBackgroundColor: --bck-msg-sent;
+    --hoverTextColor: --basic-blue;
+    --buttonFontSize: --button-in-msg-font-size;
 }
 
 .button-in-msg {
@@ -15,32 +14,32 @@ div {
     max-width: 300px;
     min-width: inherit;
     cursor: pointer;
-    border: 1px solid var(--blue);
+    border: 1px solid var(--textColor);
     border-radius: 20px;
     margin: 3px;
-    background: transparent;
+    background: var(--backgroundColor);
     overflow: hidden;
     font-family: 'Muli', sans-serif;
-    font-size: 15px;
+    font-size: var(--buttonFontSize);
     -o-text-overflow: ellipsis;
     text-overflow: ellipsis;
     white-space: nowrap;
     letter-spacing: -0.24px;
     -webkit-font-smoothing: antialiased;
-    color: var(--blue);
+    color: var(--textColor);
     line-height: 16px;
 }
 
 .action {
-    background: white;
+    background: var(--backgroundColor);
     transition: background-color .6s ease;
     &:focus,
     &:hover {
-        color: white;
-        background:  var(--blue);
+        color: var(--hoverTextColor);
+        background:  var(--hoverBackgroundColor);
         .icon-button-action {
             svg {
-                fill: white;
+                fill:  var(--hoverTextColor);
             }
         }
     }
@@ -80,4 +79,12 @@ div {
     //         height: 200px;
     //     }
     // }
-}
+}
+
+
+.disabled {
+    // border: 1px solid #999999;
+    // background-color: #cccccc;
+    // color: #666666;
+    pointer-events: none;
+}

package/src/app/chatlib/conversation-detail/message/buttons/action-button/action-button.component.ts

@@ -1,4 +1,4 @@
-import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output, SimpleChanges } from '@angular/core';
 
 @Component({
   selector: 'chat-action-button-attachment',
@@ -8,16 +8,36 @@ import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@ang
 export class ActionButtonComponent implements OnInit {
 
   @Input() button: any;
-  @Input() themeColor: string;
-  @Input() foregroundColor: string;
+  @Input() fontSize: string;
+  @Input() backgroundColor: string;
+  @Input() textColor: string;
+  @Input() hoverBackgroundColor: string;
+  @Input() hoverTextColor: string;
   @Output() onButtonClicked = new EventEmitter();
+
   public type: string = "action"
   constructor(private elementRef: ElementRef) { }
 
   ngOnInit() {
+  }
+
+  ngOnChanges(changes: SimpleChanges){
     //decomment if element should have same color of themeColor and fregroundColor
-    // this.elementRef.nativeElement.style.setProperty('--themeColor', this.themeColor);
-    // this.elementRef.nativeElement.style.setProperty('--foregroundColor', this.foregroundColor);
+    if(this.fontSize) this.elementRef.nativeElement.querySelector('.action').style.setProperty('--buttonFontSize', this.fontSize);
+    if(this.backgroundColor) this.elementRef.nativeElement.querySelector('.action').style.setProperty('--backgroundColor', this.backgroundColor);
+    if(this.textColor) this.elementRef.nativeElement.querySelector('.action').style.setProperty('--textColor', this.textColor);
+    if(this.hoverBackgroundColor) this.elementRef.nativeElement.querySelector('.action').style.setProperty('--hoverBackgroundColor', this.hoverBackgroundColor);
+    if(this.hoverTextColor) this.elementRef.nativeElement.querySelector('.action').style.setProperty('--hoverTextColor', this.hoverTextColor);
+  }
+
+  onMouseOver(event){
+    // if(this.themeColor) this.elementRef.nativeElement.querySelector('.action').style.background = this.themeColor
+    // if(this.foregroundColor) this.elementRef.nativeElement.querySelector('.action').style.color = this.foregroundColor
+  }
+
+  onMouseOut(event){
+    // this.elementRef.nativeElement.querySelector('.action').style.color = '';
+    // this.elementRef.nativeElement.querySelector('.action').style.background = ''
   }
 
   actionButtonAction(){

package/src/app/chatlib/conversation-detail/message/buttons/link-button/link-button.component.html

@@ -1,4 +1,5 @@
-<div class="button-in-msg url" (click)="actionButtonUrl()" title="{{button?.value}}"> 
+<div class="button-in-msg url" (click)="actionButtonUrl()" title="{{button?.value}}"
+(mouseover)="onMouseOver($event)" (mouseout)="onMouseOut($event)"> 
   <span *ngIf="button?.target !== 'self'" class="icon-button-action">
     <!-- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="black" width="12px" height="12px">
       <path d="M0 0h24v24H0z" fill="none"/>

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

@@ -1,12 +1,11 @@
 // @import '../../../../../sass/variables';
 
 div {
-    --bck-msg-sent: #62a8ea;
-    --col-msg-sent:#ffffff;
-    --light-white: #f7f7f7;
-    --black: #1a1a1a;
-    --gray: #aaaaaa;
-    --blue: rgb(42, 106, 193);
+    --backgroundColor: --basic-blue;
+    --textColor: --bck-msg-sent;
+    --hoverBackgroundColor: --bck-msg-sent;
+    --hoverTextColor: --basic-blue;
+    --buttonFontSize: --button-in-msg-font-size;
 }
 
 .button-in-msg {
@@ -15,19 +14,19 @@ div {
     max-width: 300px;
     min-width: inherit;
     cursor: pointer;
-    border: 1px solid var(--blue);
+    border: 1px solid var(--textColor);
     border-radius: 20px;
     margin: 3px;
-    background: transparent;
+    background: var(--backgroundColor);
     overflow: hidden;
     font-family: 'Muli', sans-serif;
-    font-size: 15px;
+    font-size: var(--buttonFontSize);
     -o-text-overflow: ellipsis;
     text-overflow: ellipsis;
     white-space: nowrap;
     letter-spacing: -0.24px;
     -webkit-font-smoothing: antialiased;
-    color: var(--blue);
+    color: var(--textColor);
     line-height: 16px;
 }
 
@@ -38,23 +37,23 @@ div {
         top: -1px;
         right: 1px;
         svg {
-            fill: var(--blue);
+            fill: var(--textColor);
         }
     }
     .icon-button-action-self{
         position: absolute;
         right: 1px;
         svg {
-            fill: var(--blue);
+            fill: var(--textColor);
         }
     }
     &:focus,
     &:hover {
-        color: white;
-        background:  var(--blue);
+        color: var(--hoverTextColor);
+        background:  var(--hoverBackgroundColor);
         .icon-button-action, .icon-button-action-self {
             svg {
-                fill: white;
+                fill: var(--hoverTextColor);
             }
         }
     }

package/src/app/chatlib/conversation-detail/message/buttons/link-button/link-button.component.ts

@@ -1,4 +1,4 @@
-import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output, SimpleChanges } from '@angular/core';
 
 @Component({
   selector: 'chat-link-button-attachment',
@@ -8,16 +8,35 @@ import { Component, ElementRef, EventEmitter, Input, OnInit, Output } from '@ang
 export class LinkButtonComponent implements OnInit {
 
   @Input() button: any;
-  @Input() themeColor: string;
-  @Input() foregroundColor: string;
+  @Input() fontSize: string;
+  @Input() backgroundColor: string;
+  @Input() textColor: string;
+  @Input() hoverBackgroundColor: string;
+  @Input() hoverTextColor: string;
   @Output() onButtonClicked = new EventEmitter();
   public type: string = "url"
   constructor(private elementRef: ElementRef) { }
 
   ngOnInit() {
+  }
+
+  ngOnChanges(changes: SimpleChanges){
     //decomment if element should have same color of themeColor and fregroundColor
-    // this.elementRef.nativeElement.style.setProperty('--themeColor', this.themeColor);
-    // this.elementRef.nativeElement.style.setProperty('--foregroundColor', this.foregroundColor);
+    if(this.fontSize) this.elementRef.nativeElement.querySelector('.url').style.setProperty('--buttonFontSize', this.fontSize);
+    if(this.backgroundColor) this.elementRef.nativeElement.querySelector('.url').style.setProperty('--backgroundColor', this.backgroundColor);
+    if(this.textColor) this.elementRef.nativeElement.querySelector('.url').style.setProperty('--textColor', this.textColor);
+    if(this.hoverBackgroundColor) this.elementRef.nativeElement.querySelector('.url').style.setProperty('--hoverBackgroundColor', this.hoverBackgroundColor);
+    if(this.hoverTextColor) this.elementRef.nativeElement.querySelector('.url').style.setProperty('--hoverTextColor', this.hoverTextColor);
+  }
+
+  onMouseOver(event){
+    // if(this.themeColor) this.elementRef.nativeElement.querySelector('.url').style.background = this.themeColor
+    // if(this.foregroundColor) this.elementRef.nativeElement.querySelector('.url').style.color = this.foregroundColor
+  }
+
+  onMouseOut(event){
+    // this.elementRef.nativeElement.querySelector('.url').style.color = '';
+    // this.elementRef.nativeElement.querySelector('.url').style.background = ''
   }
 
   actionButtonUrl(){

package/src/app/chatlib/conversation-detail/message/buttons/text-button/text-button.component.html

@@ -1,3 +1,8 @@
-<div class="button-in-msg text" (click)="actionButtonText()" title="{{button?.value}}">
+<div class="button-in-msg text" 
+[ngClass]="{'disabled': isConversationArchived}"
+title="{{button?.value}}"
+(click)="actionButtonText()" 
+(mouseover)="onMouseOver($event)" 
+(mouseout)="onMouseOut($event)">
   {{button?.value}}
 </div>