Merge branch 'feature/add_user_in_collaboration' into debug/console_logs

# Conflicts:
#	public_new/js/views/collaboration/collaboration-add-user.js

public_new/css/chat.css

@@ -73,6 +73,9 @@ input[name="tab_item"] {
   width: 90px;
   max-height: 60px;
 }
+#addUserFormInCollaboration .chat_list li {
+  border-bottom: 1px solid #e2e8f0;
+}
 .chat_list ul li {
   list-style: none;
   border-bottom: 1px solid #e2e8f0;

public_new/css/collaboration.css

@@ -794,7 +794,7 @@
 }
 
 #selectedUserListinCollaboration {
-  height: 400px;
+  height: 50vh;
   overflow: scroll;
 }
 

public_new/js/views/collaboration/collaboration-add-user.js

@@ -18,6 +18,9 @@ CollaborationUI.initialBindAddUserButton = function () {
             ChatManagementCommon.selectedUserList
         );
 
+        if (ChatManagementCommon.selectedUserList.length == 0) {
+          return;
+        }
 
         const selectedUserList =
           ChatManagementCommon.selectedUserList.join(",");
@@ -353,7 +356,7 @@ CollaborationUI.bindAddUserButton = function (selectedUsers) {
       let userIDList = selectedUsers.map((user) => user.shopMemberId);
       const commaJoinedUserIDList = userIDList.join(",");
       const collaborationType = globalUserInfo.collaborationType;
-
+      scrollTo(0, 0);
       NativeBridgeDelegate.inviteCollaboration(
         commaJoinedUserIDList,
         collaborationType

public_new/js/views/collaboration/collaboration.js

@@ -13,14 +13,16 @@ document.addEventListener("DOMContentLoaded", function () {
   // モーダルonモーダル（前のモーダルを非表示に）
   // ホスト変更ボタン押下イベント
   CollaborationUI.bindChangeHostButton();
+});
 
+document.addEventListener("readystatechange", () => {
+  if (document.readyState === "complete") {
+    CollaborationUI.initialBindAddUserButton();
     // 閉じるイベント
     CollaborationUI.bindCloseButton();
-
     // ユーザー追加イベント
     CollaborationUI.bindInviteButton();
-
-  CollaborationUI.initialBindAddUserButton();
+  }
 });
 
 /*********************************
@@ -75,16 +77,14 @@ CollaborationUI.bindChangeHostButton = function () {
 CollaborationUI.bindCloseButton = function () {
   console.log("peacekim:: CollaborationUI.bindCloseButton");
   $(".close_btn").click(function () {
-    $("#add_user_list").addClass("none");
-    $(".modal-backdrop").addClass("none");
-    
+    scrollTo(0, 0);
     CollaborationUI.bindDisableScroll();
   });
 };
 
 CollaborationUI.bindInviteButton = function () {
   $(".inv_btn").click(function () {
-    $("#add_user_list").addClass("none");
+    scrollTo(0, 0);
   });
 };
 

public_new/modal_add_user_confirm.html

 <div class="modal fade add_user_confirm_modal" id="modalAddUserConfirm" tabindex="-1" role="dialog"
-     aria-labelledby="modalAddUserConfirm" aria-hidden="true" style="position: fixed;">
-    <div class="modal-dialog modal-dialog-centered modal_collaboration_user" role="document">
-        <div class="modal-content" style="position: fixed;top: 0;height: 100%;width: 100%;left:0;right: 0;margin: 0 auto;">
+    aria-labelledby="modalAddUserConfirm" aria-hidden="true" style="position: fixed; overflow-y: hidden;">
+    <div class="modal-dialog modal-dialog-centered modal_collaboration_user" role="document" style="max-width: 100%;">
+        <div class="modal-content" style="height:70vh; width:90vw;">
             <div class="modal-header border-0 pb-0">
                 <span class="m-auto">ユーザー招待</span>
             </div>
@@ -16,7 +16,8 @@
                                     <div class="chat_item d-flex flex-row align-items-center w-100">
                                         <div class="chat_item_l">
                                             <div class="thumbnail">
-                                                <div class="img_wrap"><img src="{{profileUrl}}" onError="this.src='./img/noImage.png'"/></div>
+                                                <div class="img_wrap"><img src="{{profileUrl}}"
+                                                        onError="this.src='./img/noImage.png'" /></div>
                                             </div>
                                         </div>
                                         <div class="chat_item_m px-0">
@@ -34,8 +35,10 @@
                     </ul>
                 </div>
             </div>
-            <div class="modal-footer border-0 justify-content-center" style="position: relative;width: 100%;background-color: white;">
-                <button type="button" id="cancelAddUserBtn" class="profile_favorite_btn bg_white border_gray text_blue cancel_add_user_btn">
+            <div class="modal-footer border-0 justify-content-center"
+                style="position: relative;width: 100%;background-color: white;">
+                <button type="button" id="cancelAddUserBtn"
+                    class="profile_favorite_btn bg_white border_gray text_blue cancel_add_user_btn">
                     <div class="d-flex flex-column">
                         <span>キャンセル</span>
                     </div>

public_new/modal_add_user_list.html

 <!-- コンテンツ -->
 <div class="modal fade add_user_modal" id="addUserInCollaboration" tabindex="-1" role="dialog"
     aria-labelledby="addUserInCollaboration" aria-hidden="true">
-    <div class="modal-dialog-centered modal_collaboration_user" role="document">
+    <div class="modal-dialog modal-dialog-centered modal_collaboration_user" role="document" style="max-width: 100%;">
         <div class="modal-content">
             <form id="addUserFormInCollaboration" action="chat_add_user_confirm.html" method="post">
                 <!-- ユーザー検索 -->