fix: don't copy to clipboard if textbox is empty

rnag · Feb 11, 2024 · 61d8a29 · 61d8a29
1 parent 1d728ee
commit 61d8a29
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/src/components/medium/medium.js b/src/components/medium/medium.js
@@ -3,31 +3,29 @@ import './medium.css';
 import { connect } from 'react-redux';
 
 const Medium = props => {
-    const { content, copySuccess } = props;
+    const { content: _, copySuccess } = props;
 
-    let text;
-
-    if (content) {
-        text = (
-            <div>
-                {(copySuccess && (
-                    <h3 style={{ color: 'green' }}>
-                        Copied to Clipboard!
+    const copyStatusMessage = (
+        <div>
+            {(copySuccess && (
+                <h3 style={{ color: 'green' }}>
+                    Copied to Clipboard!
+                </h3>
+            )) ||
+                (copySuccess === undefined && (
+                    <h3 style={{ color: 'gray' }}>
+                        Waiting to copy rich text...
                     </h3>
                 )) || <h3 style={{ color: 'red' }}>Error!</h3>}
-            </div>
-        );
-    } else {
-        text = (
-            <div>
-                <h3 style={{ color: 'gray' }}>
-                    Waiting to copy rich text...
-                </h3>
-            </div>
-        );
-    }
+        </div>
+    );
 
-    return <div id="medium" className="medium" children={text}></div>;
+    return (
+        <div
+            id="medium"
+            className="medium"
+            children={copyStatusMessage}></div>
+    );
 };
 
 export default connect(state => ({

diff --git a/src/components/textfield/textfield.js b/src/components/textfield/textfield.js
@@ -13,8 +13,10 @@ const TextField = props => {
         let copySuccess;
 
         try {
-            await copyRichToClip(converter(contentVal));
-            copySuccess = true;
+            if (contentVal) {
+                await copyRichToClip(converter(contentVal));
+                copySuccess = true;
+            } else copySuccess = undefined;
         } catch (e) {
             console.log('Fail', e);
             copySuccess = false;

diff --git a/src/state.js b/src/state.js
@@ -9,7 +9,7 @@ export function setContent(content, copySuccess) {
 export function reducer(
     state = {
         content: '',
-        copySuccess: false,
+        copySuccess: undefined,
     },
     action
 ) {