Skip to content

Commit 29a185f

Browse files
committed
Bug fixes
1 parent 14f717e commit 29a185f

File tree

5 files changed

+23
-19
lines changed

5 files changed

+23
-19
lines changed

css/backdrop-blur.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.backdrop-blur {
22
overflow: hidden;
33
z-index: 9;
4-
backdrop-filter: blur(25px) brightness(25%);
4+
backdrop-filter: blur(0px) brightness(25%);
55
opacity: 1;
66
transition-duration: 0.25s;
77
pointer-events: all;

css/message-tail.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
.message-tail {
22
position: absolute;
33
z-index: -1;
4+
bottom: -5px;
45
}
56

67
.message-sender-tail {
7-
bottom: -1px;
88
transform: scaleX(-100%);
99
right: -5px;
1010
}
1111

1212
.message-recipient-tail {
13-
bottom: -1px;
1413
left: -5px;
1514
}
1615

css/message.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535

3636
.message-clone {
3737
z-index: 10;
38+
position: absolute;
39+
pointer-events: none;
3840
}
3941

4042
.message-media {

pages/Home.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ const Home = async () => {
7373
</div>
7474
</div>
7575
76-
<div class="backdrop-blur backdrop-blur-hidden" onclick="HideReactionPopups()"></div>
77-
7876
</div>
7977
<div class="page-view page-view-popup page-view-popup-hidden" id="settings-page">
8078
<div class="settings-scroll">
@@ -224,6 +222,9 @@ const Home = async () => {
224222
</div>
225223
</div>
226224
</main>
225+
226+
<div class="backdrop-blur backdrop-blur-hidden" onclick="HideReactionPopups()"></div>
227+
227228
<script>${
228229
await (async() => {
229230
Log(`Embedding file "../build/production.js" into HTML document!`, LogColors.Success)

scripts/iMessage.js

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,8 @@ const HideReactionPopups = async () => {
347347
document.getElementsByClassName("reaction-popup")[0].classList.remove("reaction-popup-visible")
348348
document.getElementsByClassName("backdrop-blur")[0].classList.add('backdrop-blur-hidden')
349349
await new Promise(r => setTimeout(r, 500));
350-
while (document.getElementsByClassName("message-clone")[0])
351-
document.getElementsByClassName("message-clone")[0].remove()
350+
//if (document.getElementsByClassName("message-clone")[0])
351+
// document.getElementsByClassName("message-clone")[0].remove()
352352
}
353353

354354
const ShowSettings = () => {
@@ -621,16 +621,6 @@ const CreateMessageBubble = (TypingIndicator = false, MessageJSON = {}, Message
621621

622622
const MessageArea = MessageContentItem.getBoundingClientRect()
623623

624-
// Clone current message to display on top-level
625-
const CloneMessage = CreateMessageBubble(TypingIndicator, MessageJSON, Message, Sender, AddTail, false)[0]
626-
CloneMessage.classList.add("message-clone")
627-
document.getElementById("page1").appendChild(CloneMessage)
628-
CloneMessage.style.top = `-${window.visualViewport.height - MessageArea.top - 46}px`
629-
if (Sender)
630-
CloneMessage.style.right = `${window.visualViewport.width - MessageArea.right - 12}px`
631-
else
632-
CloneMessage.style.left = `${MessageArea.left - 12}px`
633-
634624
// Create new tapback popup
635625
let ReactionPopup = document.createElement("div")
636626
ReactionPopup.classList.add("reaction-popup")
@@ -654,6 +644,19 @@ const CreateMessageBubble = (TypingIndicator = false, MessageJSON = {}, Message
654644
document.getElementsByClassName("backdrop-blur")[0].classList.remove('backdrop-blur-hidden')
655645
document.body.appendChild(ReactionPopup)
656646

647+
// Clone current message to display on top-level
648+
const CloneMessage = CreateMessageBubble(TypingIndicator, MessageJSON, Message, Sender, AddTail, false)[0]
649+
CloneMessage.classList.add("message-clone")
650+
651+
if (document.getElementsByClassName("message-clone")[0])
652+
document.getElementsByClassName("message-clone")[0].remove()
653+
document.getElementsByClassName("reaction-popup")[0].parentElement.insertBefore(CloneMessage, document.getElementsByClassName("reaction-popup")[0])
654+
CloneMessage.style.top = `${MessageArea.top - 6}px`
655+
if (Sender)
656+
CloneMessage.style.right = `${window.visualViewport.width - MessageArea.right - 12}px`
657+
else
658+
CloneMessage.style.left = `${MessageArea.left - 12}px`
659+
657660
let CurrentReactions = JSON.parse(MessageContentItem.getAttribute("rawjson")).reactions
658661
for (let x = 0; x < CurrentReactions.length; x++) {
659662
if (CurrentReactions[x].sender == 1 && CurrentReactions[x].reactionType < 3000) {
@@ -697,7 +700,7 @@ const SetTypingIndicator = (On = true) => {
697700
}
698701

699702
const LoadFetchedMessages = async (json) => {
700-
703+
701704
while (MessageContainer.firstChild)
702705
MessageContainer.firstChild.remove()
703706

@@ -1283,7 +1286,6 @@ setInterval(() => {
12831286
}
12841287
}, 60000);
12851288

1286-
console.log(GetPrefetchedContacts())
12871289
if (GetPrefetchedContacts()) {
12881290
LoadFetchedChats(GetPrefetchedContacts())
12891291
}

0 commit comments

Comments
 (0)