r4sas/tweb-i2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Markup tooltip:

Browse Source 
Fix displaying tooltip when changing selection with keyboard
Change position of tooltip when changing selection
This commit is contained in:
Eduard Kuzmenko 2022-01-25 22:17:41 +04:00
parent 2fee50f96c
commit b0225329c9
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/chat/markupTooltip.ts
View File

@ -17,6 +17,7 @@ import { attachClickEvent } from "../../helpers/dom/clickEvent";
import getSelectedNodes from "../../helpers/dom/getSelectedNodes";
import isSelectionEmpty from "../../helpers/dom/isSelectionEmpty";
import { MarkdownType, markdownTags } from "../../helpers/dom/getRichElementValue";
import getVisibleRect from "../../helpers/dom/getVisibleRect";
//import { logger } from "../../lib/logger";
export default class MarkupTooltip {
@ -251,7 +252,9 @@ export default class MarkupTooltip {
this.container.style.maxWidth = inputRect.width + 'px';
const selectionTop = selectionRect.top + (bodyRect.top * -1);
const visibleRect = getVisibleRect(undefined, this.appImManager.chat.input.messageInput, false, selectionRect);
const selectionTop = visibleRect.rect.top/* selectionRect.top */ + (bodyRect.top * -1);
const currentTools = this.container.classList.contains('is-link') ? this.wrapper.lastElementChild : this.wrapper.firstElementChild;
@ -333,12 +336,12 @@ export default class MarkupTooltip {
//document.removeEventListener('mouseup', this.onMouseUp);
}; */
private onMouseUpSingle = (e: Event) => {
private onMouseUpSingle = (e?: Event) => {
//this.log('onMouseUpSingle');
this.waitingForMouseUp = false;
if(IS_TOUCH_SUPPORTED) {
cancelEvent(e);
e && cancelEvent(e);
if(this.mouseUpCounter++ === 0) {
this.resetSelection(this.savedRange);
} else {
@ -383,7 +386,8 @@ export default class MarkupTooltip {
return;
}
if(document.activeElement !== this.appImManager.chat.input.messageInput) {
const messageInput = this.appImManager.chat.input.messageInput;
if(document.activeElement !== messageInput) {
this.hide();
return;
}
@ -412,8 +416,12 @@ export default class MarkupTooltip {
this.show();
}, {once: true, passive: false}); */
}
} else {
} else if(this.container && this.container.classList.contains('is-visible')) {
this.setTooltipPosition();
} else if(messageInput.matches(':active')) {
this.setMouseUpEvent();
} else {
this.show();
}
});
}

3
src/helpers/dom/getVisibleRect.ts
View File

@ -4,8 +4,7 @@
* https://github.com/morethanwords/tweb/blob/master/LICENSE
*/
export default function getVisibleRect(element: HTMLElement, overflowElement: HTMLElement, lookForSticky?: boolean) {
const rect = element.getBoundingClientRect();
export default function getVisibleRect(element: HTMLElement, overflowElement: HTMLElement, lookForSticky?: boolean, rect = element.getBoundingClientRect()) {
const overflowRect = overflowElement.getBoundingClientRect();
let {top: overflowTop, bottom: overflowBottom} = overflowRect;