Merge pull request #16940 from calixteman/get_back_focus_when_required
[Editor] Only get back the focus when it has been lost after an editor has been moved in the DOM
This commit is contained in:
		
						commit
						953f271425
					
				@ -398,14 +398,18 @@ class AnnotationEditorLayer {
 | 
			
		||||
      // re-enable them when the editor has the focus.
 | 
			
		||||
      editor._focusEventsAllowed = false;
 | 
			
		||||
      setTimeout(() => {
 | 
			
		||||
        editor.div.addEventListener(
 | 
			
		||||
          "focusin",
 | 
			
		||||
          () => {
 | 
			
		||||
            editor._focusEventsAllowed = true;
 | 
			
		||||
          },
 | 
			
		||||
          { once: true }
 | 
			
		||||
        );
 | 
			
		||||
        activeElement.focus();
 | 
			
		||||
        if (!editor.div.contains(document.activeElement)) {
 | 
			
		||||
          editor.div.addEventListener(
 | 
			
		||||
            "focusin",
 | 
			
		||||
            () => {
 | 
			
		||||
              editor._focusEventsAllowed = true;
 | 
			
		||||
            },
 | 
			
		||||
            { once: true }
 | 
			
		||||
          );
 | 
			
		||||
          activeElement.focus();
 | 
			
		||||
        } else {
 | 
			
		||||
          editor._focusEventsAllowed = true;
 | 
			
		||||
        }
 | 
			
		||||
      }, 0);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user