refactor: use element.matches(':focus')

taiga-family · Jan 23, 2024 · 6b314fa · 6b314fa
1 parent c0828a7
commit 6b314fa
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 26 deletions.
diff --git a/projects/core/src/index.ts b/projects/core/src/index.ts
@@ -13,7 +13,6 @@ export {
     MaskitoPreprocessor,
 } from './lib/types';
 export {
-    maskitoGetFocused,
     maskitoInitialCalibrationPlugin,
     maskitoPipe,
     maskitoStrictCompositionPlugin,

diff --git a/projects/core/src/lib/mask.ts b/projects/core/src/lib/mask.ts
@@ -9,7 +9,6 @@ import {
     getWordSelection,
     isRedo,
     isUndo,
-    maskitoGetFocused,
     maskitoPipe,
     maskitoTransform,
 } from './utils';
@@ -160,7 +159,7 @@ export class Maskito extends MaskHistory {
         const {element} = this;
 
         if (
-            maskitoGetFocused(element.ownerDocument) === element &&
+            element.matches(':focus') &&
             (element.selectionStart !== from || element.selectionEnd !== to)
         ) {
             element.setSelectionRange?.(from, to);

diff --git a/projects/core/src/lib/utils/dom/get-focused.ts b/projects/core/src/lib/utils/dom/get-focused.ts
diff --git a/projects/core/src/lib/utils/dom/update-element.ts b/projects/core/src/lib/utils/dom/update-element.ts
@@ -1,5 +1,4 @@
 import {ElementState} from '../../types';
-import {maskitoGetFocused} from './get-focused';
 
 /**
  * Sets value to element, and dispatches input event
@@ -24,7 +23,7 @@ export function maskitoUpdateElement(
 
         element.value = valueOrElementState.value;
 
-        if (maskitoGetFocused(element.ownerDocument) === element) {
+        if (element.matches(':focus')) {
             element.setSelectionRange?.(from, to);
         }
     }

diff --git a/projects/core/src/lib/utils/index.ts b/projects/core/src/lib/utils/index.ts
@@ -1,5 +1,4 @@
 export * from './dom/event-listener';
-export * from './dom/get-focused';
 export * from './dom/history-events';
 export * from './dom/update-element';
 export * from './element-states-equality';

diff --git a/projects/kit/src/lib/plugins/caret-guard.ts b/projects/kit/src/lib/plugins/caret-guard.ts
@@ -1,4 +1,4 @@
-import {maskitoGetFocused, MaskitoPlugin} from '@maskito/core';
+import {MaskitoPlugin} from '@maskito/core';
 
 import {clamp} from '../utils';
 
@@ -17,7 +17,7 @@ export function maskitoCaretGuard(
         };
 
         const listener = (): void => {
-            if (maskitoGetFocused(document) !== element) {
+            if (!element.matches(':focus')) {
                 return;
             }