From 9119e8169671946045741216cbc4002d91a1e43e Mon Sep 17 00:00:00 2001
From: Alex Yakovlev <ayakovlev.it@gmail.com>
Date: Wed, 15 Nov 2023 18:19:20 +0400
Subject: [PATCH 1/2] Fix detection of LeetCode V2 using improved document
 query logic

Enhanced the function isLeetCodeV2 to more accurately determine if the current page is a version of LeetCode. The function now checks for the presence of specific root elements and body classes that indicate whether the page is using Chakra UI light or dark themes, as well as the presence of the "__next" root element. This ensures a more reliable and precise detection of LeetCode's version and UI themes, improving the overall functionality of the script.

Issue: #51
---
 scripts/leetcode.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/scripts/leetcode.js b/scripts/leetcode.js
index ee7915f0..ce9d7761 100644
--- a/scripts/leetcode.js
+++ b/scripts/leetcode.js
@@ -925,7 +925,19 @@ chrome.storage.local.get('isSync', data => {
 });
 
 let leetCode;
-const isLeetCodeV2 = document.getElementById('chakra-script') != null;
+const isLeetCodeV2 = () => {
+  const rootElementNextApp = !!document.querySelector("#__next");
+  const bodyContainsChakraUILight = !!document.querySelector(
+    "body.chakra-ui-light"
+  );
+  const bodyContainsChakraUIDark = !!document.querySelector(
+    "body.chakra-ui-dark"
+  );
+  return (
+    rootElementNextApp || bodyContainsChakraUIDark || bodyContainsChakraUILight
+  );
+}
+
 if (!isLeetCodeV2) {
   leetCode = new LeetCodeV1();
 } else {

From b91fef0b47e8d1819f4d9f375eec9d3f69c79b06 Mon Sep 17 00:00:00 2001
From: Yakovlev Alex <ayakovlev.it@gmail.com>
Date: Fri, 1 Dec 2023 17:45:48 +0400
Subject: [PATCH 2/2] Fixed submissionId for send solve

---
 scripts/leetcode.js | 73 ++++++++++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/scripts/leetcode.js b/scripts/leetcode.js
index ce9d7761..82273ffc 100644
--- a/scripts/leetcode.js
+++ b/scripts/leetcode.js
@@ -658,10 +658,7 @@ LeetCodeV2.prototype.init = async function () {
   async function getSubmissionId() {
     return new Promise((resolve, reject) => {
       setTimeout(() => {
-        const submissionNode = document.getElementsByClassName(
-          'text-label-r flex items-center justify-center gap-1 rounded px-3 py-1 text-xs font-medium leading-[16px]',
-        )[0].parentNode;
-        const submissionId = submissionNode.getAttribute('href').split('=')[1]; // '/problems/two-sum/post-solution?submissionId=999594717'
+        const submissionId = document.URL.match(/\/(\d+)\/?$/)[1]; // '/problems/two-sum/post-solution?submissionId=999594717'
         resolve(submissionId);
       }, 100);
     });
@@ -924,27 +921,7 @@ chrome.storage.local.get('isSync', data => {
   }
 });
 
-let leetCode;
-const isLeetCodeV2 = () => {
-  const rootElementNextApp = !!document.querySelector("#__next");
-  const bodyContainsChakraUILight = !!document.querySelector(
-    "body.chakra-ui-light"
-  );
-  const bodyContainsChakraUIDark = !!document.querySelector(
-    "body.chakra-ui-dark"
-  );
-  return (
-    rootElementNextApp || bodyContainsChakraUIDark || bodyContainsChakraUILight
-  );
-}
-
-if (!isLeetCodeV2) {
-  leetCode = new LeetCodeV1();
-} else {
-  leetCode = new LeetCodeV2();
-}
-
-const loader = () => {
+const loader = (leetCode) => {
   let iterations = 0;
   const intervalId = setInterval(async () => {
     try {
@@ -1038,21 +1015,43 @@ const loader = () => {
   }, 1000);
 };
 
-function handleCtrlEnter(event) {
-  if (event.key === 'Enter' && event.ctrlKey) {
-    loader()
+const isMacOS = window.navigator.userAgent.includes('Mac');
+
+// Submit by Keyboard Shortcuts only support on LeetCode v2
+function submitByShortcuts(event, leetCodeV2) {
+  const isEnterKey = event.key === 'Enter';
+
+  // Adapt to MacOS operating system
+  if (isEnterKey && ((isMacOS && event.metaKey) || (!isMacOS && event.ctrlKey))) {
+    loader(leetCodeV2);
   }
 }
 
-// TODO: have event listeners to be added once the button elements are loaded using Mutation Observer
-// maybe this will help https://stackoverflow.com/questions/68329405/javascript-wait-until-element-loaded-on-website-using-chrome-extension
-// Wait for the submit button to load
-setTimeout(() => {
+// Use MutationObserver to determine when the submit button elements are loaded
+const observer = new MutationObserver(function (_mutations, observer) {
   const v1SubmitBtn = document.querySelector('[data-cy="submit-code-btn"]');
   const v2SubmitBtn = document.querySelector('[data-e2e-locator="console-submit-button"]');
-  const submitBtn = !isLeetCodeV2 ? v1SubmitBtn : v2SubmitBtn;
-  submitBtn.addEventListener('click', loader);
+  const textareaList = document.getElementsByTagName('textarea');
+  const textarea = textareaList.length === 4 ? textareaList[2] : textareaList[1];
+
+  if(v1SubmitBtn) {
+    observer.disconnect();
+
+    const leetCode = new LeetCodeV1();
+    v1SubmitBtn.addEventListener('click', () => loader(leetCode));
+    return;
+  }
+
+  if(v2SubmitBtn && textarea) {
+    observer.disconnect();
+
+    const leetCode = new LeetCodeV2();
+    v2SubmitBtn.addEventListener('click', () => loader(leetCode));
+    textarea.addEventListener('keydown', e => submitByShortcuts(e, leetCode));
+  }
+});
 
-  const textarea = document.getElementsByTagName('textarea')[0]
-  textarea.addEventListener('keydown', handleCtrlEnter)
-}, 2000);
+observer.observe(document.body, {
+  childList: true,
+  subtree: true,
+});
\ No newline at end of file