Merge pull request #18 from silentsoft/dev

Bugfix - clipboard copy issue
silentsoft · Jul 30, 2024 · 0fd92d9 · 0fd92d9
2 parents e2f0cdb + 4a2d7d3
commit 0fd92d9
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 44 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 1.4.1 (31 Jul 2024)
+
+## Bugfixes
+- Fix clipboard copy issue
+
 # 1.4.0 (18 Mar 2022)
 
 ## Enhancements

diff --git a/NOTICE.md b/NOTICE.md
@@ -2717,10 +2717,6 @@ __make-dir 3.1.0__
  * sindresorhus.com
  * MIT License
 
-__copy-text-to-clipboard 3.0.1__
- * https://sindresorhus.com
- * MIT License
-
 __watchpack 2.3.1__
  * https://github.com/webpack/watchpack
  * MIT License

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,13 +1,12 @@
 {
   "name": "hits",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "private": true,
   "dependencies": {
     "@nivo/calendar": "^0.79.1",
     "@nivo/colors": "^0.79.1",
     "@nivo/core": "^0.79.0",
     "axios": "^0.26.0",
-    "copy-text-to-clipboard": "^3.0.1",
     "env-cmd": "^10.1.0",
     "react": "^17.0.2",
     "react-color": "^2.19.3",

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.silentsoft</groupId>
     <artifactId>hits</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
 
     <name>Hits</name>
     <description>Hit Counter for Your GitHub or Any Kind of Websites You Want</description>

diff --git a/src/main/react/components/BadgeCard.js b/src/main/react/components/BadgeCard.js
@@ -1,18 +1,25 @@
 import {useRef, useState} from "react";
-import copy from "copy-text-to-clipboard";
 
 export default function BadgeCard(props) {
     const valueRef = useRef(null);
     const [copied, setCopied] = useState(false);
     const copyToClipboard = () => {
-        try {
-            copy(valueRef.current.textContent);
+        if (navigator.clipboard) {
+            navigator.clipboard.writeText(valueRef.current.textContent).then(() => {
+                setCopied(true);
+                setTimeout(() => {
+                    setCopied(false);
+                }, 1500);
+            })
+        } else {
+            const textarea = document.createElement('textarea');
+            textarea.value = valueRef.current.textContent;
+            document.body.appendChild(textarea);
+            textarea.select();
+            document.execCommand('copy');
             setCopied(true);
-            setTimeout(() => {
-                setCopied(false);
-            }, 1500);
-        } catch (e) {
-            console.error(e);
+            setTimeout(() => setCopied(false), 1500);
+            document.body.removeChild(textarea);
         }
     };
     return (