fix getting of the upload manager (#2947)

DevExpress · Aug 9, 2023 · e84b45a · e84b45a
1 parent 5b521ef
commit e84b45a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "testcafe-hammerhead",
   "description": "A powerful web-proxy used as a core for the TestCafe testing framework (https://github.com/DevExpress/testcafe).",
-  "version": "31.4.13",
+  "version": "31.4.14",
   "homepage": "https://github.com/DevExpress/testcafe-hammerhead",
   "bugs": {
     "url": "https://github.com/DevExpress/testcafe-hammerhead/issues"

diff --git a/src/client/sandbox/node/element.ts b/src/client/sandbox/node/element.ts
@@ -1005,7 +1005,7 @@ export default class ElementSandbox extends SandboxBase {
         domProcessor.processElement(el, urlUtils.convertToProxyUrl);
     }
 
-    addFileInputInfo (el: HTMLElement): void {
+    addFileInputInfo (el: HTMLInputElement): void {
         const infoManager = this._uploadSandbox.infoManager;
         const files       = infoManager.getFiles(el);
 

diff --git a/src/client/sandbox/upload/index.ts b/src/client/sandbox/upload/index.ts
@@ -39,7 +39,7 @@ export default class UploadSandbox extends SandboxBase {
     static _getCurrentInfoManager (input: HTMLInputElement) {
         const contextWindow = input[INTERNAL_PROPS.processedContext];
 
-        return getSandboxBackup(contextWindow).upload.infoManager;
+        return contextWindow && getSandboxBackup(contextWindow).upload.infoManager;
     }
 
     /*eslint-disable max-nested-callbacks */
@@ -97,7 +97,9 @@ export default class UploadSandbox extends SandboxBase {
     }
 
     static getUploadElementValue (input: HTMLInputElement) {
-        return UploadSandbox._getCurrentInfoManager(input).getValue(input);
+        const infoManager = UploadSandbox._getCurrentInfoManager(input);
+
+        return infoManager ? infoManager.getValue(input) : '';
     }
 
     setUploadElementValue (input: HTMLInputElement, value: string): void {

diff --git a/src/client/sandbox/upload/info-manager.ts b/src/client/sandbox/upload/info-manager.ts
@@ -116,7 +116,7 @@ export default class UploadInfoManager {
         return null;
     }
 
-    getValue (input) {
+    getValue (input: HTMLInputElement) {
         const inputInfo = this.getUploadInfo(input);
 
         // eslint-disable-next-line no-restricted-properties

diff --git a/src/client/utils/html.ts b/src/client/utils/html.ts
@@ -45,9 +45,6 @@ const WRAP_DOCTYPE_RE       = /<!doctype([^>]*)>/ig;
 const WRAP_DOCTYPE_TEMPLATE = `<${ FAKE_DOCTYPE_TAG_NAME }>$1</${ FAKE_DOCTYPE_TAG_NAME }>`;
 const UNWRAP_DOCTYPE_RE     = new RegExp(`<${ FAKE_DOCTYPE_TAG_NAME }>([\\S\\s]*?)</${ FAKE_DOCTYPE_TAG_NAME }>`, 'ig');
 
-const FIND_SVG_RE      = /<svg\s?[^>]*>/ig;
-const FIND_NS_ATTRS_RE = /\s(?:NS[0-9]+:[^"']+('|")[\S\s]*?\1|[^:]+:NS[0-9]+=(?:""|''))/g;
-
 const STORED_ATTRS_SELECTOR = (() => {
     const storedAttrs = [];